Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/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_EXTENSIONS_TAB_HELPER_H_
 #define CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/active_tab_permission_manager.h"
 #include "chrome/browser/extensions/app_notify_channel_setup.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
+#include "chrome/browser/tab_contents/web_contents_user_data.h"
 #include "chrome/common/web_apps.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-class TabContents;
 struct WebApplicationInfo;
 
 namespace content {
 struct LoadCommittedDetails;
 }
 
 namespace extensions {
 class Extension;
 class LocationBarController;
 class ScriptBadgeController;
 class ScriptExecutor;
 
 // Per-tab extension helper. Also handles non-extension apps.
 class TabHelper : public content::WebContentsObserver,
                   public ExtensionFunctionDispatcher::Delegate,
                   public ImageLoadingTracker::Observer,
                   public WebstoreInlineInstaller::Delegate,
                   public AppNotifyChannelSetup::Delegate,
                   public base::SupportsWeakPtr<TabHelper>,
-                  public content::NotificationObserver {
+                  public content::NotificationObserver,
+                  public WebContentsUserData<TabHelper> {
  public:
   // Different types of action when web app info is available.
   // OnDidGetApplicationInfo uses this to dispatch calls.
   enum WebAppAction {
     NONE,             // No action at all.
     CREATE_SHORTCUT,  // Bring up create application shortcut dialog.
     UPDATE_SHORTCUT   // Update icon for app shortcut.
   };
 
-  explicit TabHelper(TabContents* tab_contents);
+  explicit TabHelper(content::WebContents* web_contents);
   virtual ~TabHelper();
-
-  // Copies the internal state from another TabHelper.
-  void CopyStateFrom(const TabHelper& source);
+  static int kUserDataKey;
 
   void CreateApplicationShortcuts();
   bool CanCreateApplicationShortcuts() const;
 
   void set_pending_web_app_action(WebAppAction action) {
     pending_web_app_action_ = action;
   }
 
   // App extensions ------------------------------------------------------------
 
@@ skipping 20 matching lines @@
     return web_app_info_;
   }
 
   // If an app extension has been explicitly set for this WebContents its icon
   // is returned.
   //
   // NOTE: the returned icon is larger than 16x16 (its size is
   // Extension::EXTENSION_ICON_SMALLISH).
   SkBitmap* GetExtensionAppIcon();
 
-  TabContents* tab_contents() {
-    return tab_contents_;
-  }
-
   content::WebContents* web_contents() const {
     return content::WebContentsObserver::web_contents();
   }
 
   ScriptExecutor* script_executor() {
     return &script_executor_;
   }
 
   LocationBarController* location_bar_controller() {
     return location_bar_controller_.get();
   }
 
   ActiveTabPermissionManager* active_tab_permission_manager() {
-    return &active_tab_permission_manager_;
+    return active_tab_permission_manager_.get();
   }
 
   // Sets a non-extension app icon associated with WebContents and fires an
   // INVALIDATE_TYPE_TITLE navigation state change to trigger repaint of title.
   void SetAppIcon(const SkBitmap& app_icon);
 
  private:
   // content::WebContentsObserver overrides.
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void DidCloneToNewWebContents(
+      content::WebContents* old_web_contents,
+      content::WebContents* new_web_contents) OVERRIDE;
 
   // ExtensionFunctionDispatcher::Delegate overrides.
   virtual extensions::WindowController* GetExtensionWindowController()
       const OVERRIDE;
   virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
 
   // Message handlers.
   void OnDidGetApplicationInfo(int32 page_id, const WebApplicationInfo& info);
   void OnInstallApplication(const WebApplicationInfo& info);
   void OnInlineWebstoreInstall(int install_id,
@@ skipping 68 matching lines @@
 
   // Cached web app info data.
   WebApplicationInfo web_app_info_;
 
   // Which deferred action to perform when OnDidGetApplicationInfo is notified
   // from a WebContents.
   WebAppAction pending_web_app_action_;
 
   content::NotificationRegistrar registrar_;
 
-  TabContents* tab_contents_;
-
   ScriptExecutor script_executor_;
 
   scoped_ptr<LocationBarController> location_bar_controller_;
 
-  ActiveTabPermissionManager active_tab_permission_manager_;
+  scoped_ptr<ActiveTabPermissionManager> active_tab_permission_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_