Split Autofill webdata

chrome/browser/webdata/DEPS

Index: chrome/browser/webdata/DEPS
diff --git a/chrome/browser/webdata/DEPS b/chrome/browser/webdata/DEPS
index c680c71bba4a54672152aec8c1ef9c08333c82f3..98e94fbb9e9a340a7c11417aef70251140625b6a 100644
--- a/chrome/browser/webdata/DEPS
+++ b/chrome/browser/webdata/DEPS
@@ -14,21 +14,36 @@ include_rules = [
   # and please do not introduce more #includes of these files.
   "!chrome/browser/history/history_database.h",
   "!chrome/browser/password_manager/ie7_password.h",
-  "!chrome/browser/search_engines/search_terms_data.h",
-  "!chrome/browser/search_engines/template_url.h",
-  "!chrome/browser/search_engines/template_url_id.h",
-  "!chrome/browser/search_engines/template_url_service.h",
-  "!chrome/browser/ui/profile_error_dialog.h",
+
+  # TODO(caitkp): Remove this, at slightly lower priority - this is
+  # just a set of header-only enums, so we can live with it
+  # temporarily even after we componentize.
   "!chrome/common/chrome_notification_types.h",
-  # Do not add to the list of temporarily-allowed dependencies above,
-  # and please do not introduce more #includes of these files.
 ]
 
 specific_include_rules = {
-  'web_data_service_factory\.(h|cc)': [
-    "!chrome/browser/profiles/profile.h",
-    "!chrome/browser/profiles/profile_dependency_manager.h",
-    "!chrome/browser/profiles/profile_keyed_service.h",
-    "!chrome/browser/profiles/profile_keyed_service_factory.h",
-  ]
+  # These files are staying in //chrome, so no need to restrict.
+
+r'((autocomplete|autofill_profile)_syncable_service|web_data_service(_win)?(_factory)?)(_unittest)?\.(cc|h)':
+[
+    '+chrome/browser',
+    '+chrome/common',
+  ],
+
+  # TODO(caitkp): Componentize all the different tables. For now, we
+  # write these rules so they don't add bad dependencies.
+  r'^(?!autofill)[a-z_]+_table(_unittest)?\.(cc|h)': [
+    "!chrome/browser/history/history_database.h",
+    "!chrome/browser/search_engines/search_terms_data.h",
+    "!chrome/browser/search_engines/template_url.h",
+    "!chrome/browser/search_engines/template_url_id.h",
+    "!chrome/browser/search_engines/template_url_service.h",
+  ],
+
+  # TODO(caitkp): Extract unit tests from //chrome, at lower priority
+  # than production code.
+  r'(.*_unittest|.*_test_util)\.(cc|h)': [
+    "+chrome/browser/webdata/web_data_service.h",
+    "+chrome/browser/webdata/web_data_service_factory.h",
+  ],
 }