Introduce a couple of abstract bases for WebDataService.

chrome/browser/autofill/DEPS

 include_rules = [
   # Autofill is being made into a Browser Component, so we have these
   # three basic rules followed by temporary exceptions.  Please don't
   # add to the list of exceptions!
   "-chrome/browser",
   "+chrome/browser/api",
   "+chrome/browser/autofill",
 
   # Permanently-allowed DEPS beyond the standard Browser
   # Components-like DEPS above go here.
   "+third_party/libphonenumber",  # For phone number i18n.
 
   # TODO(joi): Bring this list to zero.
   #
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
   "!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",
   "!chrome/browser/sync/profile_sync_service.h",
   "!chrome/browser/sync/profile_sync_service_factory.h",
   "!chrome/browser/sync/profile_sync_service_observer.h",
   "!chrome/browser/ui/tab_contents/tab_contents.h",
-  "!chrome/browser/webdata/autofill_entry.h",
-  "!chrome/browser/webdata/web_data_service.h",
-  "!chrome/browser/webdata/web_data_service_factory.h",
   # Do not add to the list of temporarily-allowed dependencies above,
   # and please do not introduce more #includes of these files.
 
   # TODO(akalin): Remove this dependency.
   "!sync/util/data_encryption_win.h",
 ]
 
 specific_include_rules = {
   # TODO(joi): Bring this list to zero.
   #
   # Do not add to the list of temporarily-allowed dependencies below,
   # and please do not introduce more #includes of these files.
   '.*_[a-z]*test\.cc': [
     "!chrome/browser/password_manager/encryptor.h",
     "!chrome/browser/translate/translate_infobar_delegate.h",
     "!chrome/browser/translate/translate_manager.h",
+    "!chrome/browser/webdata/web_data_service.h",
+    "!chrome/browser/webdata/web_data_service_factory.h",
     "!chrome/browser/ui/autofill/tab_autofill_manager_delegate.h",
     "!chrome/browser/ui/browser.h",
     "!chrome/browser/ui/browser_tabstrip.h",
     "!chrome/browser/ui/browser_window.h",
     "!chrome/browser/ui/tab_contents/tab_autofill_manager_delegate.h",
     "!chrome/browser/ui/tab_contents/test_tab_contents.h",
-  ]
+  ],
+
+  # TODO(joi): Get rid of the need for this, e.g. by moving
+  # PersonalDataManagerFactory to chrome/browser/configuration.
+  'personal_data_manager_factory\.cc': [
+    "!chrome/browser/webdata/web_data_service_factory.h",
+  ],
 }