[Clean up] Replace SearchTabHelper NAV_ENTRY_COMMITTED notification observer with WebContentsObserve

chrome/browser/ui/search/search_tab_helper.h

 // Copyright 2012 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_UI_SEARCH_SEARCH_TAB_HELPER_H_
 #define CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/ui/search/search_ipc_router.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/common/instant_types.h"
 #include "chrome/common/ntp_logging_events.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 #include "ui/base/window_open_disposition.h"
 
 namespace content {
 class WebContents;
+struct LoadCommittedDetails;
 }
 
 class GURL;
 class InstantPageTest;
 class InstantService;
 class Profile;
 class SearchIPCRouterTest;
 
 // Per-tab search "helper".  Acts as the owner and controller of the tab's
 // search UI model.
 //
 // When the page is finished loading, SearchTabHelper determines the instant
 // support for the page. When a navigation entry is committed (except for
 // in-page navigations), SearchTabHelper resets the instant support state to
 // INSTANT_SUPPORT_UNKNOWN and cause support to be determined again.
-class SearchTabHelper : public content::NotificationObserver,
-                        public content::WebContentsObserver,
+class SearchTabHelper : public content::WebContentsObserver,
                         public content::WebContentsUserData<SearchTabHelper>,
                         public InstantServiceObserver,
                         public SearchIPCRouter::Delegate {
  public:
   virtual ~SearchTabHelper();
 
   SearchModel* model() {
     return &model_;
   }
 
@@ skipping 132 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
                            DetermineIfPageSupportsInstant_Local);
   FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
                            DetermineIfPageSupportsInstant_NonLocal);
   FRIEND_TEST_ALL_PREFIXES(InstantPageTest,
                            PageURLDoesntBelongToInstantRenderer);
   FRIEND_TEST_ALL_PREFIXES(InstantPageTest, PageSupportsInstant);
 
   explicit SearchTabHelper(content::WebContents* web_contents);
 
-  // Overridden from content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // Overridden from contents::WebContentsObserver:
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void DidFailProvisionalLoad(
       int64 frame_id,
       const string16& frame_unique_name,
       bool is_main_frame,
       const GURL& validated_url,
       int error_code,
       const string16& error_description,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFinishLoad(
       int64 frame_id,
       const GURL& validated_url,
       bool is_main_frame,
       content::RenderViewHost* render_view_host) OVERRIDE;
+  virtual void NavigationEntryCommitted(
+      const content::LoadCommittedDetails& load_details) OVERRIDE;
 
   // Overridden from SearchIPCRouter::Delegate:
   virtual void OnInstantSupportDetermined(bool supports_instant) OVERRIDE;
   virtual void OnSetVoiceSearchSupport(bool supports_voice_search) OVERRIDE;
   virtual void FocusOmnibox(OmniboxFocusState state) OVERRIDE;
   virtual void NavigateToURL(const GURL& url,
                              WindowOpenDisposition disposition,
                              bool is_most_visited_item_url) OVERRIDE;
   virtual void OnDeleteMostVisitedItem(const GURL& url) OVERRIDE;
   virtual void OnUndoMostVisitedDeletion(const GURL& url) OVERRIDE;
@@ skipping 34 matching lines @@
   void RedirectToLocalNTP();
 
   const bool is_search_enabled_;
 
   // Tracks the last value passed to OmniboxEditModelChanged().
   bool user_input_in_progress_;
 
   // Model object for UI that cares about search state.
   SearchModel model_;
 
-  content::NotificationRegistrar registrar_;
-
   content::WebContents* web_contents_;
 
   SearchIPCRouter ipc_router_;
 
   InstantService* instant_service_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_