Profile shouldn't own PersonalDataManager

chrome/browser/sync/glue/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_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
 #pragma once
 
 #include <map>
-#include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/non_thread_safe.h"
-#include "chrome/browser/autofill/personal_data_manager.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"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ skipping 12 matching lines @@
 
 // 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 NotificationObserver,
       public base::NonThreadSafe {
  public:
-  AutofillProfileSyncableService(WebDatabase* web_database,
-                                 PersonalDataManager* data_manager,
-                                 Profile* profile);
+  AutofillProfileSyncableService(WebDatabase* web_database, Profile* profile);
   virtual ~AutofillProfileSyncableService();
 
   static syncable::ModelType model_type() { return syncable::AUTOFILL_PROFILE; }
 
   // SyncableService implementation.
   virtual SyncError MergeDataAndStartSyncing(
       syncable::ModelType type,
       const SyncDataList& initial_sync_data,
       SyncChangeProcessor* sync_processor) OVERRIDE;
   virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
@@ skipping 67 matching lines @@
   // Creates SyncData based on supplied |profile|.
   static SyncData CreateData(const AutofillProfile& profile);
 
   // For unit-tests.
   AutofillProfileSyncableService();
   void set_sync_processor(SyncChangeProcessor* sync_processor) {
     sync_processor_ = sync_processor;
   }
 
   WebDatabase* web_database_;
-  PersonalDataManager* personal_data_;
+  Profile* profile_;
   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_;
 
   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_SYNC_GLUE_AUTOFILL_PROFILE_SYNCABLE_SERVICE_H_
-