Switch SearchTabHelper to use WebContentsUserData.

chrome/browser/ui/search/search_tab_helper.h

 // Copyright (c) 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 "base/basictypes.h"
+#include "chrome/browser/tab_contents/web_contents_user_data.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 
 class OmniboxEditModel;
-class TabContents;
 
 namespace content {
 class RenderViewHost;
 class RenderWidgetHost;
 class WebContents;
 }
 
 namespace chrome {
 namespace search {
 
 // Per-tab search "helper".  Acts as the owner and controller of the tab's
 // search UI model.
 class SearchTabHelper : public content::WebContentsObserver,
-                        public content::NotificationObserver {
+                        public content::NotificationObserver,
+                        public WebContentsUserData<SearchTabHelper> {
  public:
-  SearchTabHelper(TabContents* contents, bool is_search_enabled);
   virtual ~SearchTabHelper();
 
   SearchModel* model() {
     return &model_;
   }
 
   // Invoked when the OmniboxEditModel changes state in some way that might
   // affect the search mode.
   void OmniboxEditModelChanged(bool user_input_in_progress, bool cancelling);
 
@@ skipping 10 matching lines @@
   virtual void DocumentLoadedInFrame(
       int64 frame_id,
       content::RenderViewHost* render_view_host) OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
+  explicit SearchTabHelper(content::WebContents* web_contents);
+  static int kUserDataKey;
+  friend class WebContentsUserData<SearchTabHelper>;
+
   // Enum of the load states for the NTP.
   //
   // Once the user loads the NTP the |ntp_load_state_| changes to
   // WAITING_FOR_FRAME_ID and the search::mode::Type changes to
   // MODE_NTP_LOADING. The |ntp_load_state_| progresses through the remaining
   // states and when done search::mode::Type is changed to MODE_NTP.
   //
   // This code is intended to avoid a flash between white (default background
   // color) and the background the pages wants (gray). We know the CSS has been
   // applied once we get DocumentLoadedInFrame() and we know the backing store
@@ skipping 15 matching lines @@
     // The document finished painting.
     PAINTED,
   };
 
   // Sets the mode of the model based on |url|.  |state| distinguishes between
   // loading and loaded ntp states.  |animate| is based on initial navigation
   // and used for the mode change on the |model_|.
   void UpdateModelBasedOnURL(const GURL& url, NTPLoadState state, bool animate);
 
   // Returns the web contents associated with the tab that owns this helper.
-  content::WebContents* web_contents();
+  const content::WebContents* web_contents() const;
 
   // Returns the current RenderWidgetHost of the |web_contents()|.
   content::RenderWidgetHost* GetRenderWidgetHost();
 
-  const bool is_search_enabled_;
+  bool is_search_enabled_;
 
   bool is_initial_navigation_commit_;
 
   // Model object for UI that cares about search state.
   SearchModel model_;
 
   content::NotificationRegistrar registrar_;
 
   // See description above NTPLoadState.
   NTPLoadState ntp_load_state_;
 
   // See description above NTPLoadState.
   int64 main_frame_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchTabHelper);
 };
 
 }  // namespace search
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_SEARCH_SEARCH_TAB_HELPER_H_