Remove knowledge of Chrome-specific SyncableService classes from WebDataService.

chrome/browser/webdata/autofill_profile_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/autofill_profile_syncable_service.h"
 
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 std::string LimitData(const std::string& data) {
   std::string sanitized_value(data);
   if (sanitized_value.length() > AutofillTable::kMaxDataLength)
     sanitized_value.resize(AutofillTable::kMaxDataLength);
   return sanitized_value;
 }
 
+void* UserDataKey() {
+  return reinterpret_cast<void*>(
+      &AutofillProfileSyncableService::CreateForWebDataService);
+}
+
 }  // namespace
 
 const char kAutofillProfileTag[] = "google_chrome_autofill_profiles";
 
 AutofillProfileSyncableService::AutofillProfileSyncableService(
     WebDataService* web_data_service)
     : web_data_service_(web_data_service) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   DCHECK(web_data_service_);
   notification_registrar_.Add(
       this,
       chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
       content::Source<WebDataService>(web_data_service_));
 }
 
 AutofillProfileSyncableService::~AutofillProfileSyncableService() {
   DCHECK(CalledOnValidThread());
 }
 
+// static
+void AutofillProfileSyncableService::CreateForWebDataService(
+    WebDataService* web_data) {

[Cait (Slow), 2013/03/19 19:49:46]

It seems like the syncable services should be hung off of AutofillWebData or
WebDataServiceBase rather than WebDataService. Their purpose is to listen for
Autofill changes and sync them, and presumably, once we split the webdatas,
notifications of these changes will come from AutofillWebDatas rather than
WebDataService objects... wdyt?

[Cait (Slow), 2013/03/19 20:24:24]

Just saw your TODOs on this -- I'll work on converting these to be keyed off
AutofillWebData now.

+  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));
 }
 
 syncer::SyncMergeResult
 AutofillProfileSyncableService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
@@ skipping 481 matching lines @@
 }
 
 AutofillTable* AutofillProfileSyncableService::GetAutofillTable() const {
   return AutofillTable::FromWebDatabase(web_data_service_->GetDatabase());
 }
 
 AutofillProfileSyncableService::DataBundle::DataBundle() {}
 
 AutofillProfileSyncableService::DataBundle::~DataBundle() {
 }