Remove knowledge of Chrome-specific SyncableService classes from WebDataService.

chrome/browser/webdata/autocomplete_syncable_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 61 matching lines @@
       return true;
     } else {
       new_timestamps->insert(new_timestamps->begin(),
                              timestamps.begin(),
                              timestamps.end());
       return false;
     }
   }
 }
 
+// See |UserDataKey| below.
+int user_data_key = 0;

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

nit: this could be pulled into the body of UserDataKey() as a static.  Principle
of narrowest scope...

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

Done. I've also added it to my TODO list to update a few instances of the same
pattern in the codebase.

+
+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
 
 AutocompleteSyncableService::AutocompleteSyncableService(
     WebDataService* web_data_service)
     : web_data_service_(web_data_service),
       cull_expired_entries_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   DCHECK(web_data_service_);
   notification_registrar_.Add(
       this, chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
       content::Source<WebDataService>(web_data_service));
 }
 
 AutocompleteSyncableService::~AutocompleteSyncableService() {
   DCHECK(CalledOnValidThread());
 }
 
+// static
+void AutocompleteSyncableService::CreateForWebDataService(
+    WebDataService* web_data) {
+  web_data->GetDBUserData()->SetUserData(
+      UserDataKey(), new AutocompleteSyncableService(web_data));
+}
+
+// static
+AutocompleteSyncableService* AutocompleteSyncableService::FromWebDataService(
+    WebDataService* web_data) {
+  return static_cast<AutocompleteSyncableService*>(
+      web_data->GetDBUserData()->GetUserData(UserDataKey()));
+}
+
 AutocompleteSyncableService::AutocompleteSyncableService()
     : web_data_service_(NULL),
       cull_expired_entries_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 }
 
 syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
@@ skipping 348 matching lines @@
                            UTF16ToUTF8(entry.key().value())));
   return syncer::SyncData::CreateLocalData(tag, tag, autofill_specifics);
 }
 
 // static
 std::string AutocompleteSyncableService::KeyToTag(const std::string& name,
                                                   const std::string& value) {
   std::string ns(kAutofillEntryNamespaceTag);
   return ns + net::EscapePath(name) + "|" + net::EscapePath(value);
 }