Nail down DEPS of Autofill-specific code in chrome/renderer.

Remove a couple of unnecessary includes, write DEPS that allows
includes of files that will move to //components/autofill, and add a
temporary allowance for an include we'll get rid of by moving
Autofill-specific switches to a header in the Autofill component.

Also, mark include of GaiaUrls file as permanently allowed, as I don't
think there was any plan to get rid of this.

TBR=ben@chromium.org
BUG=140037


Review URL: https://chromiumcodereview.appspot.com/12550007

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

4 files changed, 35 insertions, 3 deletions

diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index 9fced60..7e0c303 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -26,3 +26,17 @@ include_rules = [
   "+third_party/smhasher",
   "+third_party/sqlite",
 ]
+
+# TODO(joi): Remove these once Autofill code moves to //components/autofill.
+specific_include_rules = {
+  'page_click_listener\.h': [
+    "-chrome/renderer",
+  ],
+  'page_click_tracker\.(h|cc)': [
+    "-chrome/common",
+    "-chrome/renderer",
+    "+chrome/renderer/autofill",
+    "+chrome/renderer/page_click_listener.h",
+    "+chrome/renderer/page_click_tracker.h",
+  ],
+}
diff --git a/chrome/renderer/autofill/DEPS b/chrome/renderer/autofill/DEPS
index 2e4187f..78af89d 100644
--- a/chrome/renderer/autofill/DEPS
+++ b/chrome/renderer/autofill/DEPS
@@ -1,3 +1,23 @@
+# TODO(joi): Most of these are only required until the Autofill
+# renderer code moves to //components/autofill/renderer and common
+# code to //components/autofill/common, at which point we'll have much
+# simpler DEPS.
 include_rules = [
-  "!google_apis/gaia/gaia_urls.h",
+  "-chrome/common",
+  "-chrome/renderer",
+  "+chrome/renderer/autofill",
+  "+chrome/renderer/page_click_listener.h",
+  "+chrome/common/autofill/autocheckout_status.h",
+  "+chrome/common/autofill/web_element_descriptor.h",
+  "+chrome/common/autofill_messages.h",
+  "+chrome/common/form_data.h",
+  "+chrome/common/form_data_predictions.h",
+  "+chrome/common/form_field_data.h",
+  "+chrome/common/form_field_data_predictions.h",
+  "+chrome/common/password_form_fill_data.h",
+  "+chrome/common/password_generation_util.h",
+  "+google_apis/gaia/gaia_urls.h",
+
+  # TODO(joi): Get rid of this by extracting Autofill-specific switches.
+  "!chrome/common/chrome_switches.h",
 ]
diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index 653b601..2ff06ec 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -10,7 +10,6 @@
 #include "base/strings/string_split.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/renderer/autofill/form_autofill_util.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
 #include "components/autofill/common/autocheckout_status.h"
diff --git a/chrome/renderer/page_click_tracker.cc b/chrome/renderer/page_click_tracker.cc
index 3b3118a..27d4a1c 100644
--- a/chrome/renderer/page_click_tracker.cc
+++ b/chrome/renderer/page_click_tracker.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/page_click_tracker.h"
 
-#include "chrome/common/render_messages.h"
 #include "chrome/renderer/autofill/form_autofill_util.h"
 #include "chrome/renderer/page_click_listener.h"
 #include "content/public/renderer/render_view.h"