Use BrowserContext as key in API. Switch Autofill to use BC in place of Profile.

chrome/browser/autofill/personal_data_manager.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_AUTOFILL_PERSONAL_DATA_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/credit_card.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/api/webdata/autofill_web_data.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class AutofillMetrics;
 class FormStructure;
 class PersonalDataManagerObserver;
-class Profile;
 
 namespace autofill_helper {
 void SetProfiles(int, std::vector<AutofillProfile>*);
 void SetCreditCards(int, std::vector<CreditCard>*);
 }
 
+namespace content {
+class BrowserContext;
+}
+
 // Handles loading and saving Autofill profile information to the web database.
 // This class also stores the profiles loaded from the database for use during
 // Autofill.
 class PersonalDataManager
     : public WebDataServiceConsumer,
       public ProfileSyncServiceObserver,
       public ProfileKeyedService,
       public content::NotificationObserver {
  public:
   // WebDataServiceConsumer:
@@ skipping 166 matching lines @@
   // profiles the user has. On subsequent calls, does nothing.
   void LogProfileCount() const;
 
   // Returns the value of the AutofillEnabled pref.
   virtual bool IsAutofillEnabled() const;
 
   // For tests.
   const AutofillMetrics* metric_logger() const;
   void set_metric_logger(const AutofillMetrics* metric_logger);
 
-  // The profile hosting this PersonalDataManager.
-  Profile* profile_;
+  // The browser context this PersonalDataManager is in.
+  content::BrowserContext* browser_context_;
 
   // True if personal data has been loaded from the web database.
   bool is_data_loaded_;
 
   // The loaded web profiles.
   ScopedVector<AutofillProfile> web_profiles_;
 
   // Auxiliary profiles.
   mutable ScopedVector<AutofillProfile> auxiliary_profiles_;
 
   // Storage for combined web and auxiliary profiles.  Contents are weak
   // references.  Lifetime managed by |web_profiles_| and |auxiliary_profiles_|.
   mutable std::vector<AutofillProfile*> profiles_;
 
   // The loaded credit cards.
   ScopedVector<CreditCard> credit_cards_;
 
   // When the manager makes a request from WebDataServiceBase, the database
   // is queried on another thread, we record the query handle until we
   // get called back.  We store handles for both profile and credit card queries
   // so they can be loaded at the same time.
   WebDataServiceBase::Handle pending_profiles_query_;
   WebDataServiceBase::Handle pending_creditcards_query_;
 
   // The observers.
   ObserverList<PersonalDataManagerObserver> observers_;
 
  private:
   // Kicks off asynchronous loading of profiles and credit cards.
-  void Init(Profile* profile);
+  void Init(content::BrowserContext* context);
 
   // For logging UMA metrics. Overridden by metrics tests.
   scoped_ptr<const AutofillMetrics> metric_logger_;
 
   // Whether we have already logged the number of profiles this session.
   mutable bool has_logged_profile_count_;
 
   // Manages registration lifetime for NotificationObserver implementation.
   content::NotificationRegistrar notification_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(PersonalDataManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_PERSONAL_DATA_MANAGER_H_