Have AutofillManagerDelegate supply the AutofillWebDataService to core code.

components/autofill/core/browser/autocomplete_history_manager.cc

 // Copyright 2013 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 "components/autofill/core/browser/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_messages.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/web_contents.h"
-
-using content::BrowserContext;
-using content::WebContents;
 
 namespace autofill {
 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;
 
 bool IsTextField(const FormFieldData& field) {
   return
       field.form_control_type == "text" ||
       field.form_control_type == "search" ||
       field.form_control_type == "tel" ||
       field.form_control_type == "url" ||
       field.form_control_type == "email";
 }
 
 }  // namespace
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     AutofillDriver* driver,
     AutofillManagerDelegate* manager_delegate)
-    : browser_context_(driver->GetWebContents()->GetBrowserContext()),
-      driver_(driver),
-      autofill_data_(
-          AutofillWebDataService::FromBrowserContext(browser_context_)),
+    : driver_(driver),
+      autofill_data_(manager_delegate->GetAutofillWebDataService()),
       pending_query_handle_(0),
       query_id_(0),
       external_delegate_(NULL),
       manager_delegate_(manager_delegate),
       send_ipc_(true) {
   DCHECK(manager_delegate_);
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
   CancelPendingQuery();
@@ skipping 135 matching lines @@
                                             autofill_unique_ids_);
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }
 
 }  // namespace autofill