Profile shouldn't own PersonalDataManager

chrome/browser/sync/glue/autofill_model_associator.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_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 
 class AutofillProfile;
 
+class Profile;
 class ProfileSyncService;
 class WebDatabase;
 
 namespace sync_api {
 class ReadNode;
 class WriteTransaction;
 }
 
 namespace browser_sync {
 
 class AutofillChangeProcessor;
 class UnrecoverableErrorHandler;
 
 extern const char kAutofillTag[];
 extern const char kAutofillProfileNamespaceTag[];
 extern const char kAutofillEntryNamespaceTag[];
 
 // Contains all model association related logic:
 // * Algorithm to associate autofill model and sync model.
 // We do not check if we have local data before this run; we always
 // merge and sync.
 class AutofillModelAssociator
     : public PerDataTypeAssociatorInterface<std::string, std::string> {
  public:
   static syncable::ModelType model_type() { return syncable::AUTOFILL; }
   AutofillModelAssociator(ProfileSyncService* sync_service,
                           WebDatabase* web_database,
-                          PersonalDataManager* data_manager);
+                          Profile* profile);
   virtual ~AutofillModelAssociator();
 
   // PerDataTypeAssociatorInterface implementation.
   //
   // Iterates through the sync model looking for matched pairs of items.
   virtual bool AssociateModels(SyncError* error);
 
   // Clears all associations.
   virtual bool DisassociateModels(SyncError* error);
 
@@ skipping 99 matching lines @@
       DataBundle* bundle,
       const sync_api::ReadNode& node,
       const std::vector<AutofillProfile*>& all_profiles_from_db);
 
   // Called at various points in model association to determine if the
   // user requested an abort.
   bool IsAbortPending();
 
   ProfileSyncService* sync_service_;
   WebDatabase* web_database_;
-  PersonalDataManager* personal_data_;
+  Profile* profile_;
   int64 autofill_node_id_;
 
   AutofillToSyncIdMap id_map_;
   SyncIdToAutofillMap id_map_inverse_;
 
   // Abort association pending flag and lock.  If this is set to true
   // (via the AbortAssociation method), return from the
   // AssociateModels method as soon as possible.
   base::Lock abort_association_pending_lock_;
   bool abort_association_pending_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_AUTOFILL_MODEL_ASSOCIATOR_H_