Fix a trio of autofill popup issues

components/autofill/core/browser/autocomplete_history_manager.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
 
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ skipping 28 matching lines @@
       int query_id,
       const base::string16& name,
       const base::string16& prefix,
       const std::string form_control_type,
       const std::vector<base::string16>& autofill_values,
       const std::vector<base::string16>& autofill_labels,
       const std::vector<base::string16>& autofill_icons,
       const std::vector<int>& autofill_unique_ids);
   virtual void OnFormSubmitted(const FormData& form);
 
+  // Cancels the currently pending WebDataService query, if there is one.
+  void CancelPendingQuery();
+
   // Must be public for the external delegate to use.
   void OnRemoveAutocompleteEntry(const base::string16& name,
                                  const base::string16& value);
 
   // Sets our external delegate.
   void SetExternalDelegate(AutofillExternalDelegate* delegate);
 
  protected:
   friend class AutofillManagerTest;
 
   // Sends the given |suggestions| for display in the Autofill popup.
   void SendSuggestions(const std::vector<base::string16>* suggestions);
 
  private:
-  // Cancels the currently pending WebDataService query, if there is one.
-  void CancelPendingQuery();
-
   // Provides driver-level context. Must outlive this object.
   AutofillDriver* driver_;
   scoped_refptr<AutofillWebDataService> database_;
 
   // When the manager makes a request from WebDataServiceBase, the database is
   // queried on another thread, we record the query handle until we get called
   // back.  We also store the autofill results so we can send them together.
   WebDataServiceBase::Handle pending_query_handle_;
   int query_id_;
   std::vector<base::string16> autofill_values_;
@@ skipping 10 matching lines @@
 
   // Whether IPC is sent.
   bool send_ipc_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteHistoryManager);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_