Switch WebContentsUserData to be a friended base.

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"
@@ skipping 33 matching lines @@
                   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(content::WebContents* web_contents);
   virtual ~TabHelper();
-  static int kUserDataKey;
 
   void CreateApplicationShortcuts();
   bool CanCreateApplicationShortcuts() const;
 
   void set_pending_web_app_action(WebAppAction action) {
     pending_web_app_action_ = action;
   }
 
   // App extensions ------------------------------------------------------------
 
@@ skipping 41 matching lines @@
 
   ActiveTabPermissionManager* 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:
+  explicit TabHelper(content::WebContents* web_contents);
+  static int kUserDataKey;
+  friend class WebContentsUserData<TabHelper>;
+
   // 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;
@@ skipping 90 matching lines @@
   scoped_ptr<LocationBarController> location_bar_controller_;
 
   scoped_ptr<ActiveTabPermissionManager> active_tab_permission_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TabHelper);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_TAB_HELPER_H_