Revert 66214 - Display a warning when autofill is disabled for a website....

chrome/browser/renderer_host/render_view_host.h

 // Copyright (c) 2010 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_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 393 matching lines @@
                                       const std::string& target);
 
   // Message the renderer that we should be counted as a new document and not
   // as a popup.
   void DisassociateFromPopupCount();
 
   // Tells the renderer whether it should allow window.close. This is initially
   // set to false when creating a renderer-initiated window via window.open.
   void AllowScriptToClose(bool visible);
 
-  // Resets the stored AutoFill state.
-  void ResetAutoFillState(int query_id);
-
   // Called by the AutoFillManager when the list of suggestions is ready.
-  void AutoFillSuggestionsReturned(const std::vector<string16>& values,
-                                   const std::vector<string16>& labels,
-                                   const std::vector<string16>& icons,
-                                   const std::vector<int>& unique_ids);
+  void AutoFillSuggestionsReturned(
+      int query_id,
+      const std::vector<string16>& values,
+      const std::vector<string16>& labels,
+      const std::vector<string16>& icons,
+      const std::vector<int>& unique_ids);
 
   // Called by the AutocompleteHistoryManager when the list of suggestions is
   // ready.
   void AutocompleteSuggestionsReturned(
+      int query_id,
       const std::vector<string16>& suggestions);
 
   // Called by the AutoFillManager when the FormData has been filled out.
   void AutoFillFormDataFilled(int query_id, const webkit_glue::FormData& form);
 
   // Notifies the Renderer that a move or resize of its containing window has
   // started (this is used to hide the autocomplete popups if any).
   void WindowMoveOrResizeStarted();
 
   // RenderWidgetHost public overrides.
@@ skipping 359 matching lines @@
   // True if the render view can be shut down suddenly.
   bool sudden_termination_allowed_;
 
   // The session storage namespace to be used by the associated render view.
   scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
 
   // Whether this render view will get extension api bindings. This controls
   // what process type we use.
   bool is_extension_process_;
 
-  // TODO(isherman): Consider splitting these off into a helper class.
   // AutoFill and Autocomplete suggestions.  We accumulate these separately and
   // send them back to the renderer together.
   std::vector<string16> autofill_values_;
   std::vector<string16> autofill_labels_;
   std::vector<string16> autofill_icons_;
   std::vector<int> autofill_unique_ids_;
-  int autofill_query_id_;
 
   // Whether the accessibility tree should be saved, for unit testing.
   bool save_accessibility_tree_for_testing_;
 
   // The most recently received accessibility tree - for unit testing only.
   webkit_glue::WebAccessibility accessibility_tree_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHost);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_H_