Revert 225020 "Tighten up DEPS rules in src/ui: prevent componen..."

> Tighten up DEPS rules in src/ui: prevent components from including from each other, and drop a bunch of DEPS files in to make checkdeps happy.
> 
> BUG=none
> R=sky@chromium.org
> 
> Review URL: https://codereview.chromium.org/24273005

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/24257013

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

23 files changed, 1 insertions, 89 deletions

diff --git a/ui/DEPS b/ui/DEPS
index 207c56c..44b8ff0 100644
--- a/ui/DEPS
+++ b/ui/DEPS
@@ -9,7 +9,4 @@ include_rules = [
   "+skia",
   "+third_party/mozilla",
   "+third_party/skia",
-
-  # Components within ui must state their dependencies explicitly.
-  "-ui",
 ]
diff --git a/ui/android/DEPS b/ui/android/DEPS
deleted file mode 100644
index b51da65..0000000
--- a/ui/android/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+ui/base",
-  "+ui/gfx",
-]
diff --git a/ui/aura/DEPS b/ui/aura/DEPS
index dac9fbf..381faed 100644
--- a/ui/aura/DEPS
+++ b/ui/aura/DEPS
@@ -3,10 +3,5 @@ include_rules = [
   "+grit/ui_strings.h",
   "+skia/ext",
   "+ui/base",
-  "+ui/compositor",
-  "+ui/events",
   "+ui/gfx",
-  "+ui/metro_viewer",  # TODO(beng): investigate moving remote_root_window_host
-                       #             to ui/metro_viewer.
 ]
-
diff --git a/ui/aura/test/DEPS b/ui/aura/test/DEPS
deleted file mode 100644
index f59fd38..0000000
--- a/ui/aura/test/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+ui/gl",
-]
diff --git a/ui/base/DEPS b/ui/base/DEPS
deleted file mode 100644
index 7a06564..0000000
--- a/ui/base/DEPS
+++ /dev/null
@@ -1,7 +0,0 @@
-include_rules = [
-  "+ui/events",
-  "+ui/gfx",
-  "+ui/aura/root_window.h",  # TODO(beng): resolve crazy layering violation
-  "+ui/aura/window.h",  # TODO(beng): resolve crazy layering violation
-  "+ui/views/view.h",  # TODO(beng): resolve crazy layering violation
-]
diff --git a/ui/base/test/ui_controls_internal_win.cc b/ui/base/test/ui_controls_internal_win.cc
index 2521b98..9e8c17c 100644
--- a/ui/base/test/ui_controls_internal_win.cc
+++ b/ui/base/test/ui_controls_internal_win.cc
@@ -12,7 +12,6 @@
 #include "ui/events/keycodes/keyboard_code_conversion_win.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
-// TODO(beng): wtf is this? layering violation!!!1
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS
index 2b13d17..7a2d98b 100644
--- a/ui/compositor/DEPS
+++ b/ui/compositor/DEPS
@@ -4,7 +4,5 @@
 include_rules = [
   "+cc",
   "+third_party/WebKit/public/platform/WebGraphicsContext3D.h",
-  "+ui/gfx",
-  "+ui/gl",
   "+webkit/common/gpu",
 ]
diff --git a/ui/events/DEPS b/ui/events/DEPS
deleted file mode 100644
index 40f3e97..0000000
--- a/ui/events/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+ui/base", # TODO(beng): refine
-  "+ui/gfx",
-]
diff --git a/ui/gfx/DEPS b/ui/gfx/DEPS
index 2f74209..c2b6185 100644
--- a/ui/gfx/DEPS
+++ b/ui/gfx/DEPS
@@ -2,7 +2,4 @@ include_rules = [
   "+base",
   "+skia",
   "+third_party/angle",
-  "+ui/base/ui_export.h",  # TODO(beng): remove
-  "+ui/base/layout.h",  # TODO(davemoore): remove
-  "+ui/test/ui_unittests_resource.h",  # TODO(beng): remove
 ]
diff --git a/ui/gl/DEPS b/ui/gl/DEPS
index 70a1fc1..0295562 100644
--- a/ui/gl/DEPS
+++ b/ui/gl/DEPS
@@ -1,7 +1,4 @@
 include_rules = [
   "+third_party/khronos",
   "+third_party/mesa/src/include",
-  "+ui/gfx",
-
-  "+ui/base/x/x11_util.h",  # TODO(beng): remove after landing 24273005
 ]
diff --git a/ui/keyboard/DEPS b/ui/keyboard/DEPS
index 69c820c..bfcf830 100644
--- a/ui/keyboard/DEPS
+++ b/ui/keyboard/DEPS
@@ -2,9 +2,4 @@ include_rules = [
   "+content/public",
   "+grit/keyboard_resources.h",
   "+grit/keyboard_resources_map.h",
-  "+ui/aura",
-  "+ui/base",
-  "+ui/compositor",
-  "+ui/gfx",
-  "+ui/test",
 ]
diff --git a/ui/message_center/DEPS b/ui/message_center/DEPS
index bf50ed4..f0f5325 100644
--- a/ui/message_center/DEPS
+++ b/ui/message_center/DEPS
@@ -1,11 +1,3 @@
 include_rules = [
   "+third_party/GTM",  # For Mac utility classes.
-  "+ui/aura",
-  "+ui/base",
-  "+ui/compositor",
-  "+ui/events",
-  "+ui/gfx",
-  "+ui/native_theme",
-  "+ui/test",
-  "+ui/views",
 ]
diff --git a/ui/metro_viewer/DEPS b/ui/metro_viewer/DEPS
deleted file mode 100644
index 8cb61f5..0000000
--- a/ui/metro_viewer/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+ui/events",
-  "+ui/gfx",
-]
diff --git a/ui/native_theme/DEPS b/ui/native_theme/DEPS
deleted file mode 100644
index 89cbfe6..0000000
--- a/ui/native_theme/DEPS
+++ /dev/null
@@ -1,5 +0,0 @@
-include_rules = [
-  "+ui/base",
-  "+ui/gfx",
-  "+ui/views",  # TODO(beng): BAD, circular dependency
-]
diff --git a/ui/shell_dialogs/DEPS b/ui/shell_dialogs/DEPS
deleted file mode 100644
index fdbc6a5..0000000
--- a/ui/shell_dialogs/DEPS
+++ /dev/null
@@ -1,6 +0,0 @@
-include_rules = [
-  "+ui/android",
-  "+ui/aura",
-  "+ui/base",
-  "+ui/gfx",
-]
diff --git a/ui/snapshot/DEPS b/ui/snapshot/DEPS
index ad20216..13c975d 100644
--- a/ui/snapshot/DEPS
+++ b/ui/snapshot/DEPS
@@ -1,9 +1,7 @@
 include_rules = [
   "+skia",
-  "+ui/android",
   "+ui/aura",
   "+ui/base",
   "+ui/compositor",
   "+ui/gfx",
-  "+ui/gl",
-]
+]
\ No newline at end of file
diff --git a/ui/surface/DEPS b/ui/surface/DEPS
index cadb0aa..cc5cd70 100644
--- a/ui/surface/DEPS
+++ b/ui/surface/DEPS
@@ -1,7 +1,3 @@
 include_rules = [
   "+media/base",
-  "+ui/base",
-  "+ui/events/latency_info.h",
-  "+ui/gfx",
-  "+ui/gl",
 ]
diff --git a/ui/test/DEPS b/ui/test/DEPS
deleted file mode 100644
index a88b071..0000000
--- a/ui/test/DEPS
+++ /dev/null
@@ -1,5 +0,0 @@
-include_rules = [
-  "+ui/android",
-  "+ui/base",
-  "+ui/gfx",
-]
diff --git a/ui/views/DEPS b/ui/views/DEPS
index 63372a8..16e16dc 100644
--- a/ui/views/DEPS
+++ b/ui/views/DEPS
@@ -3,10 +3,4 @@ include_rules = [
   "+grit/ui_strings.h",
   "+skia/ext",
   "+third_party/iaccessible2",
-  "+ui/aura",
-  "+ui/base",
-  "+ui/compositor",
-  "+ui/events",
-  "+ui/gfx",
-  "+ui/native_theme",
 ]
diff --git a/ui/views/controls/webview/DEPS b/ui/views/controls/webview/DEPS
index 0fad725..12acf13 100644
--- a/ui/views/controls/webview/DEPS
+++ b/ui/views/controls/webview/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
   "+content/public",
   "+ui/views",
-  "+ui/web_dialogs",
 ]
diff --git a/ui/views/linux_ui/DEPS b/ui/views/linux_ui/DEPS
deleted file mode 100644
index 00478bd..0000000
--- a/ui/views/linux_ui/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+ui/shell_dialogs",
-]
diff --git a/ui/web_dialogs/DEPS b/ui/web_dialogs/DEPS
index a1eea24..7149996 100644
--- a/ui/web_dialogs/DEPS
+++ b/ui/web_dialogs/DEPS
@@ -1,6 +1,4 @@
 include_rules = [
   "+content/public",
   "+webkit/glue",
-  "+ui/base",
-  "+ui/gfx",
 ]
diff --git a/ui/webui/DEPS b/ui/webui/DEPS
index 7ee7bc0..b67db9c 100644
--- a/ui/webui/DEPS
+++ b/ui/webui/DEPS
@@ -1,5 +1,3 @@
 include_rules = [
   "+grit/webui_resources.h",
-  "+ui/base",
-  "+ui/gfx",
 ]