Switch WebNavigationTabObserver to use WebContentsUserData.

chrome/browser/extensions/api/web_navigation/web_navigation_api.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.
 
 // Defines the Chrome Extensions WebNavigation API functions for observing and
 // intercepting navigation events, as specified in the extension JSON API.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_
 
 #include <map>
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/tab_contents/web_contents_user_data.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
 
 struct RetargetingDetails;
 
 namespace extensions {
 
 // Tab contents observer that forwards navigation events to the event router.
-class WebNavigationTabObserver : public content::NotificationObserver,
-                                 public content::WebContentsObserver {
+class WebNavigationTabObserver
+    : public content::NotificationObserver,
+      public content::WebContentsObserver,
+      public WebContentsUserData<WebNavigationTabObserver> {
  public:
-  explicit WebNavigationTabObserver(content::WebContents* web_contents);
   virtual ~WebNavigationTabObserver();
 
   // Returns the object for the given |tab_contents|.
   static WebNavigationTabObserver* Get(content::WebContents* web_contents);
 
   const FrameNavigationState& frame_navigation_state() const {
     return navigation_state_;
   }
 
   content::RenderViewHost* GetRenderViewHostInProcess(int process_id) const;
@@ skipping 43 matching lines @@
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidOpenRequestedURL(content::WebContents* new_contents,
                                    const GURL& url,
                                    const content::Referrer& referrer,
                                    WindowOpenDisposition disposition,
                                    content::PageTransition transition,
                                    int64 source_frame_num) OVERRIDE;
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
 
  private:
+  explicit WebNavigationTabObserver(content::WebContents* web_contents);
+  static int kUserDataKey;
+  friend class WebContentsUserData<WebNavigationTabObserver>;
+
   // True if the transition and target url correspond to a reference fragment
   // navigation.
   bool IsReferenceFragmentNavigation(FrameNavigationState::FrameID frame_id,
                                      const GURL& url);
 
   // Creates and sends onErrorOccurred events for all on-going navigations. If
   // |render_view_host| is non-NULL, only generates events for frames in this
   // render view host. If |id_to_skip| is given, no events are sent for that
   // frame.
   void SendErrorEvents(content::WebContents* web_contents,
@@ skipping 98 matching lines @@
 // API function that returns the states of all frames in a given tab.
 class GetAllFramesFunction : public SyncExtensionFunction {
   virtual ~GetAllFramesFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("webNavigation.getAllFrames")
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_WEB_NAVIGATION_API_H_