Sanitize checkdeps-checked DEPS a bit.

- Move dependencies closer to where they're used.
- Remove redundant comments.

Review URL: http://codereview.chromium.org/4511001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65134 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -280,8 +280,6 @@ include_rules = [
   "+base",
   "+build",
   "+ipc",
-  "+rlz",
-  "+third_party/undoview",
 
   # For now, we allow ICU to be included by specifying "unicode/...", although
   # this should probably change.
@@ -292,16 +290,16 @@ include_rules = [
 
 # checkdeps.py shouldn't check include paths for files in these dirs:
 skip_child_includes = [
-   "breakpad",
-   "chrome_frame",
-   "gears",
-   "native_client",
-   "o3d",
-   "sdch",
-   "skia",
-   "testing",
-   "third_party",
-   "v8",
+  "breakpad",
+  "chrome_frame",
+  "gears",
+  "native_client",
+  "o3d",
+  "sdch",
+  "skia",
+  "testing",
+  "third_party",
+  "v8",
 ]
 
 

chrome/DEPS

@@ -19,43 +19,14 @@ include_rules = [
 
   # Allow inclusion of WebKit API files.
   "+third_party/WebKit/WebKit/chromium",
-
-  # Allow inclusion of the appcache library.
   "+webkit/appcache",
-
-  # Allow inclusion of the blob library.
   "+webkit/blob",
-
-  # Allow inclusion of the database library.
   "+webkit/database",
-
-  # Allow inclusion of the fileapi library.
   "+webkit/fileapi",
 
-  # Allow Apple code ImageAndTextCell.
-  "+third_party/apple",
-
-  # Allow inclusion of Mozilla interface headers.
-  "+third_party/mozilla",
-
-  # Allow inclusion of NPAPI interface headers.
-  "+third_party/npapi",
-
-  # Allow inclusion of tcmalloc header.
-  "+third_party/tcmalloc",
-
-  # Allow usage of Google Toolbox for Mac.
-  "+third_party/GTM",
-
-  # Allow usage of the libjingle library.
-  "+third_party/libjingle",
-
-  # Our Skia extensions.
-  "+skia/ext",
-
-  # On Linux, we include some breakpad headers
-  "+breakpad/linux",
-
-  # On Linux, the zygote needs to access sandbox headers
-  "+sandbox/linux"
+  # Allow inclusion of third-party code:
+  "+third_party/mozilla",   # Mozilla interface headers.
+  "+third_party/npapi",     # NPAPI interface headers.
+  "+third_party/tcmalloc",  # tcmallo
+  "+third_party/GTM",       # Google Toolbox for Mac.
 ]

chrome/browser/DEPS

@@ -9,7 +9,10 @@ include_rules = [
   "+chrome/views",
   "+cros",
   "+grit",  # For generated headers
-  "+sandbox/src",
+  "+rlz",
+  "+sandbox/linux",
+  "+sandbox/src",  # The path doesn't say it, but this is the Windows sandbox.
+  "+skia/ext",
   "+skia/include",
   "+webkit/database",
   "+webkit/glue",  # Defines some types that are marshalled over IPC.
@@ -18,15 +21,18 @@ include_rules = [
   # Other libraries.
   "+chrome/third_party/hunspell",
   "+chrome/third_party/mozilla_security_manager",
-  "+libxml", # For search engine definition parsing.
-  "+media/audio", # Chrome's lightweight audio library.
+  "+libxml",  # For search engine definition parsing.
+  "+media/audio",  # Chrome's lightweight audio library.
   "+media/base",
+  "+third_party/apple",  # Apple code ImageAndTextCell.
   "+third_party/expat",
   "+third_party/gpsd",
   "+third_party/sqlite",
-  "+third_party/libevent", # For the remote V8 debugging server
+  "+third_party/libevent",  # For the remote V8 debugging server
+  "+third_party/libjingle",
   "+third_party/cld",
-  "+v8/include", # Browser uses V8 to get the version and run the debugger.
+  "+third_party/undoview",
+  "+v8/include",  # Browser uses V8 to get the version and run the debugger.
 
   # FIXME: this should probably not be here, we need to find a better
   # structure for these includes.

chrome/common/DEPS

@@ -7,7 +7,7 @@ include_rules = [
   "+media/base",
   "+remoting/client/plugin",
   "+sandbox/src",
-  "+skia/include",
+  "+skia",
   "+webkit/glue",
 
   # Other libraries.

chrome/gpu/DEPS

@@ -5,4 +5,5 @@ include_rules = [
   "+libGLESv2",
   "+media/base",
   "+media/video",
+  "+skia",
 ]

chrome/renderer/DEPS

@@ -9,7 +9,7 @@ include_rules = [
   "+media/video",
   "+ppapi/c",
   "+sandbox/src",
-  "+skia/include",
+  "+skia",
   "+webkit/extensions",
   "+webkit/glue",
   "+webkit/glue/plugins",