Clean up WebNavigationObserver by taking out password specific callbacks, and...

chrome/browser/autocomplete_history_manager.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_AUTOCOMPLETE_HISTORY_MANAGER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_
 #pragma once
 
 #include <vector>
 
 #include "chrome/browser/prefs/pref_member.h"
+#include "chrome/browser/tab_contents/web_navigation_observer.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "ipc/ipc_channel.h"
 
 namespace webkit_glue {
 struct FormData;
 }  // namespace webkit_glue
 
 class Profile;
 class TabContents;
 
 // Per-tab Autocomplete history manager. Handles receiving form data from the
 // renderer and the storing and retrieving of form data through WebDataService.
-class AutocompleteHistoryManager : public IPC::Channel::Listener,
+class AutocompleteHistoryManager : public WebNavigationObserver,
                                    public WebDataServiceConsumer {
  public:
   explicit AutocompleteHistoryManager(TabContents* tab_contents);
   virtual ~AutocompleteHistoryManager();
 
-  // IPC::Channel::Listener implementation.
+  // WebNavigationObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message);
 
   // WebDataServiceConsumer implementation.
   virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
                                            const WDTypedResult* result);
 
   // Pass-through functions that are called by AutoFillManager, after it has
   // dispatched a message.
   void OnGetAutocompleteSuggestions(
       int query_id,
@@ skipping 31 matching lines @@
   int query_id_;
   std::vector<string16> autofill_values_;
   std::vector<string16> autofill_labels_;
   std::vector<string16> autofill_icons_;
   std::vector<int> autofill_unique_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompleteHistoryManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_HISTORY_MANAGER_H_