Rename AutofillManagerDelegate to AutofillClient.

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_client.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_pref_names.h"
 #include "components/autofill/core/common/form_data.h"
 
 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)
+    AutofillClient* autofill_client)
     : driver_(driver),
-      database_(manager_delegate->GetDatabase()),
+      database_(autofill_client->GetDatabase()),
       pending_query_handle_(0),
       query_id_(0),
       external_delegate_(NULL),
-      manager_delegate_(manager_delegate) {
-  DCHECK(manager_delegate_);
+      autofill_client_(autofill_client) {
+  DCHECK(autofill_client_);
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
   CancelPendingQuery();
 }
 
 void AutocompleteHistoryManager::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
   DCHECK(pending_query_handle_);
   pending_query_handle_ = 0;
 
-  if (!manager_delegate_->IsAutocompleteEnabled()) {
+  if (!autofill_client_->IsAutocompleteEnabled()) {
     SendSuggestions(NULL);
     return;
   }
 
   DCHECK(result);
   // Returning early here if |result| is NULL.  We've seen this happen on
   // Linux due to NFS dismounting and causing sql failures.
   // See http://crbug.com/68783.
   if (!result) {
     SendSuggestions(NULL);
@@ skipping 16 matching lines @@
     const std::vector<base::string16>& autofill_labels,
     const std::vector<base::string16>& autofill_icons,
     const std::vector<int>& autofill_unique_ids) {
   CancelPendingQuery();
 
   query_id_ = query_id;
   autofill_values_ = autofill_values;
   autofill_labels_ = autofill_labels;
   autofill_icons_ = autofill_icons;
   autofill_unique_ids_ = autofill_unique_ids;
-  if (!manager_delegate_->IsAutocompleteEnabled() ||
+  if (!autofill_client_->IsAutocompleteEnabled() ||
       form_control_type == "textarea") {
     SendSuggestions(NULL);
     return;
   }
 
   if (database_.get()) {
     pending_query_handle_ = database_->GetFormValuesForElementName(
         name, prefix, kMaxAutocompleteMenuItems, this);
   }
 }
 
 void AutocompleteHistoryManager::OnFormSubmitted(const FormData& form) {
-  if (!manager_delegate_->IsAutocompleteEnabled())
+  if (!autofill_client_->IsAutocompleteEnabled())
     return;
 
   if (driver_->IsOffTheRecord())
     return;
 
   // Don't save data that was submitted through JavaScript.
   if (!form.user_submitted)
     return;
 
   // We put the following restriction on stored FormFields:
@@ skipping 68 matching lines @@
                                             autofill_unique_ids_);
 
   query_id_ = 0;
   autofill_values_.clear();
   autofill_labels_.clear();
   autofill_icons_.clear();
   autofill_unique_ids_.clear();
 }
 
 }  // namespace autofill