[Sync] Refactor non-frontend DTC to handle new API properly.

chrome/browser/webdata/autofill_profile_syncable_service.h

 // Copyright (c) 2011 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_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
+#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/sync_data.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "content/common/content_notification_types.h"
@@ skipping 10 matching lines @@
 extern const char kAutofillProfileTag[];
 
 class UnrecoverableErrorHandler;
 
 // The sync implementation for AutofillProfiles.
 // MergeDataAndStartSyncing() called first, it does cloud->local and
 // local->cloud syncs. Then for each cloud change we receive
 // ProcessSyncChanges() and for each local change Observe() is called.
 class AutofillProfileSyncableService
     : public SyncableService,
+      public base::SupportsWeakPtr<AutofillProfileSyncableService>,
       public NotificationObserver,
       public base::NonThreadSafe {
  public:
   explicit AutofillProfileSyncableService(WebDataService* web_data_service);
   virtual ~AutofillProfileSyncableService();
 
   static syncable::ModelType model_type() { return syncable::AUTOFILL_PROFILE; }
 
   // SyncableService implementation.
   virtual SyncError MergeDataAndStartSyncing(
@@ skipping 69 matching lines @@
   void ActOnChange(const AutofillProfileChange& change);
 
   // Creates SyncData based on supplied |profile|.
   static SyncData CreateData(const AutofillProfile& profile);
 
   AutofillTable* GetAutofillTable() const;
 
   // For unit-tests.
   AutofillProfileSyncableService();
   void set_sync_processor(SyncChangeProcessor* sync_processor) {
-    sync_processor_ = sync_processor;
+    sync_processor_.reset(sync_processor);
   }
 
   WebDataService* web_data_service_;  // WEAK
   NotificationRegistrar notification_registrar_;
 
   // Cached Autofill profiles. *Warning* deleted profiles are still in the
   // vector - use the |profiles_map_| to iterate through actual profiles.
   ScopedVector<AutofillProfile> profiles_;
   GUIDToProfileMap profiles_map_;
 
-  SyncChangeProcessor* sync_processor_;
+  scoped_ptr<SyncChangeProcessor> sync_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillProfileSyncableService);
 };
 
 // This object is used in unit-tests as well, so it defined here.
 struct AutofillProfileSyncableService::DataBundle {
   DataBundle();
   ~DataBundle();
 
   std::vector<std::string> profiles_to_delete;
   std::vector<AutofillProfile*> profiles_to_update;
   std::vector<AutofillProfile*> profiles_to_add;
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_WEBDATA_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_