Remove knowledge of Chrome-specific SyncableService classes from WebDataService.

chrome/browser/webdata/autofill_profile_syncable_service.cc

Index: chrome/browser/webdata/autofill_profile_syncable_service.cc
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.cc b/chrome/browser/webdata/autofill_profile_syncable_service.cc
index 980ca80777024864aac2a495c4c06dd88a39bff7..a22806549bcd3bf6197586647ebc2f8860e79f22 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.cc
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.cc
@@ -33,6 +33,15 @@ std::string LimitData(const std::string& data) {
   return sanitized_value;
 }
 
+// See |UserDataKey| below.
+int user_data_key = 0;

[dhollowa, 2013/03/20 21:47:37]

nit: Pull inside UserDataKey() as static.

[Jói, 2013/03/20 22:03:16]

Done.

+
+void* UserDataKey() {
+  // Use the address of a static that COMDAT folding won't ever fold
+  // with something else.
+  return reinterpret_cast<void*>(&user_data_key);
+}
+
 }  // namespace
 
 const char kAutofillProfileTag[] = "google_chrome_autofill_profiles";
@@ -52,6 +61,21 @@ AutofillProfileSyncableService::~AutofillProfileSyncableService() {
   DCHECK(CalledOnValidThread());
 }
 
+// static
+void AutofillProfileSyncableService::CreateForWebDataService(
+    WebDataService* web_data) {
+  web_data->GetDBUserData()->SetUserData(
+      UserDataKey(), new AutofillProfileSyncableService(web_data));
+}
+
+// static
+AutofillProfileSyncableService*
+AutofillProfileSyncableService::FromWebDataService(
+    WebDataService* service) {
+  return static_cast<AutofillProfileSyncableService*>(
+      service->GetDBUserData()->GetUserData(UserDataKey()));
+}
+
 AutofillProfileSyncableService::AutofillProfileSyncableService()
     : web_data_service_(NULL) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));