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

chrome/browser/autofill/autocomplete_history_manager.cc

 // 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.
 
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/prefs/pref_service_base.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/credit_card.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "webkit/forms/form_data.h"
 
 using base::StringPiece16;
+using content::BrowserContext;
 using content::WebContents;
 using webkit::forms::FormData;
 using webkit::forms::FormField;
 
 namespace {
 
 // Limit on the number of suggestions to appear in the pop-up menu under an
 // text input element in a form.
 const int kMaxAutocompleteMenuItems = 6;
 
@@ skipping 73 matching lines @@
 }
 
 }  // namespace
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       pending_query_handle_(0),
       query_id_(0),
       external_delegate_(NULL) {
-  profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  browser_context_ = web_contents->GetBrowserContext();
   // May be NULL in unit tests.
-  autofill_data_ = AutofillWebDataService::ForContext(profile_);
-  autofill_enabled_.Init(
-      prefs::kAutofillEnabled, PrefServiceBase::ForProfile(profile_), NULL);
+  autofill_data_ = AutofillWebDataService::ForContext(browser_context_);
+  autofill_enabled_.Init(prefs::kAutofillEnabled,
+                         PrefServiceBase::ForContext(browser_context_),
+                         NULL);
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
   CancelPendingQuery();
 }
 
 bool AutocompleteHistoryManager::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(AutocompleteHistoryManager, message)
@@ skipping 54 matching lines @@
   if (autofill_data_.get()) {
     pending_query_handle_ = autofill_data_->GetFormValuesForElementName(
         name, prefix, kMaxAutocompleteMenuItems, this);
   }
 }
 
 void AutocompleteHistoryManager::OnFormSubmitted(const FormData& form) {
   if (!*autofill_enabled_)
     return;
 
-  if (profile_->IsOffTheRecord())
+  if (browser_context_->IsOffTheRecord())
     return;
 
   // Don't save data that was submitted through JavaScript.
   if (!form.user_submitted)
     return;
 
   // We put the following restriction on stored FormFields:
   //  - non-empty name
   //  - non-empty value
   //  - text field
@@ skipping 22 matching lines @@
     autofill_data_->RemoveFormValueForElementName(name, value);
 }
 
 void AutocompleteHistoryManager::SetExternalDelegate(
     AutofillExternalDelegate* delegate) {
   external_delegate_ = delegate;
 }
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     WebContents* web_contents,
-    Profile* profile,
+    BrowserContext* browser_context,
     scoped_ptr<AutofillWebDataService> awd)
     : content::WebContentsObserver(web_contents),
-      profile_(profile),
+      browser_context_(browser_context),
       autofill_data_(awd.Pass()),
       pending_query_handle_(0),
       query_id_(0),
       external_delegate_(NULL) {
-  autofill_enabled_.Init(
-      prefs::kAutofillEnabled, PrefServiceBase::ForProfile(profile_), NULL);
+  autofill_enabled_.Init(prefs::kAutofillEnabled,
+                         PrefServiceBase::ForContext(browser_context_),
+                         NULL);
 }
 
 void AutocompleteHistoryManager::CancelPendingQuery() {
   if (pending_query_handle_) {
     SendSuggestions(NULL);
     if (autofill_data_.get())
       autofill_data_->CancelRequest(pending_query_handle_);
     pending_query_handle_ = 0;
   }
 }
@@ skipping 36 matching lines @@
                                              autofill_icons_,
                                              autofill_unique_ids_));
   }
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }