Display a warning when autofill is disabled for a website.

This depends on a WebKit change being tracked at https://bugs.webkit.org/show_bug.cgi?id=49291

BUG=58509
TEST=unit_tests --gtest_filter=AutoFillManagerTest.*:AutoFillHelperTest.*

Review URL: http://codereview.chromium.org/4591001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66214 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 14 deletions

diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc
index 2243bcb..763445b 100644
--- a/chrome/browser/autocomplete_history_manager.cc
+++ b/chrome/browser/autocomplete_history_manager.cc
@@ -73,8 +73,7 @@ bool IsSSN(const string16& text) {
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     TabContents* tab_contents) : tab_contents_(tab_contents),
-                                 pending_query_handle_(0),
-                                 query_id_(0) {
+                                 pending_query_handle_(0) {
   DCHECK(tab_contents);
 
   profile_ = tab_contents_->profile();
@@ -94,17 +93,17 @@ void AutocompleteHistoryManager::FormSubmitted(const FormData& form) {
   StoreFormEntriesInWebDatabase(form);
 }
 
-bool AutocompleteHistoryManager::GetAutocompleteSuggestions(
-    int query_id, const string16& name, const string16& prefix) {
-  if (!*autofill_enabled_)
-    return false;
+void AutocompleteHistoryManager::GetAutocompleteSuggestions(
+    const string16& name, const string16& prefix) {
+  if (!*autofill_enabled_) {
+    SendSuggestions(NULL);
+    return;
+  }
 
   CancelPendingQuery();
 
-  query_id_ = query_id;
   pending_query_handle_ = web_data_service_->GetFormValuesForElementName(
       name, prefix, kMaxAutocompleteMenuItems, this);
-  return true;
 }
 
 void AutocompleteHistoryManager::RemoveAutocompleteEntry(
@@ -130,8 +129,7 @@ AutocompleteHistoryManager::AutocompleteHistoryManager(
     Profile* profile, WebDataService* wds) : tab_contents_(NULL),
                                              profile_(profile),
                                              web_data_service_(wds),
-                                             pending_query_handle_(0),
-                                             query_id_(0) {
+                                             pending_query_handle_(0) {
   autofill_enabled_.Init(
       prefs::kAutoFillEnabled, profile_->GetPrefs(), NULL);
 }
@@ -187,10 +185,8 @@ void AutocompleteHistoryManager::SendSuggestions(const WDTypedResult* result) {
     DCHECK(result->GetType() == AUTOFILL_VALUE_RESULT);
     const WDResult<std::vector<string16> >* autofill_result =
         static_cast<const WDResult<std::vector<string16> >*>(result);
-    host->AutocompleteSuggestionsReturned(
-        query_id_, autofill_result->GetValue());
+    host->AutocompleteSuggestionsReturned(autofill_result->GetValue());
   } else {
-    host->AutocompleteSuggestionsReturned(
-        query_id_, std::vector<string16>());
+    host->AutocompleteSuggestionsReturned(std::vector<string16>());
   }
 }