Remove knowledge of Chrome-specific SyncableService classes from WebDataService.

chrome/browser/webdata/autocomplete_syncable_service.h

 // 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.
 #ifndef CHROME_BROWSER_WEBDATA_AUTOCOMPLETE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOCOMPLETE_SYNCABLE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 29 matching lines @@
 // TODO(georgey) : remove reliance on the notifications and make it to be called
 // from web_data_service directly.
 class AutocompleteSyncableService
     : public syncer::SyncableService,
       public content::NotificationObserver,
       public base::NonThreadSafe {
  public:
   explicit AutocompleteSyncableService(WebDataService* web_data_service);
   virtual ~AutocompleteSyncableService();
 
+  // Retrieves the AutocompleteSyncableService stored on |web_data|.
+  static AutocompleteSyncableService* FromWebData(WebDataServiceBase* web_data);
+
+  // Attaches |service| to |web_data|, transferring ownership to |web_data|.
+  static void AttachToWebData(scoped_ptr<AutocompleteSyncableService> service,
+                              WebDataServiceBase* web_data);

[Ilya Sherman, 2013/03/18 21:24:48]

Why not follow the pattern used elsewhere in the Autofill code, of inheriting
from base::SupportsUserData::Data, exposing CreateForWebDataService() instead of
AttachToWebData(), and hiding the constructor and destructor?

[Jói, 2013/03/18 22:11:34]

I was aware of the pattern but didn't think to apply it this time; I think I had
pigeonholed it as a pattern for things hanging off of WebContents. Makes perfect
sense, will switch to that.

+
   static syncer::ModelType model_type() { return syncer::AUTOFILL; }
 
   // syncer::SyncableService implementation.
   virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;
   virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
   virtual syncer::SyncDataList GetAllSyncData(
@@ skipping 89 matching lines @@
   scoped_ptr<syncer::SyncErrorFactory> error_handler_;
 
   // Whether we should cull expired autofill entries, can be updated by sync
   // via UpdateCullingSetting.
   bool cull_expired_entries_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteSyncableService);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOCOMPLETE_SYNCABLE_SERVICE_H_