Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/ui/browser_navigator.cc

 // 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.
 
 #include "chrome/browser/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 114 matching lines @@
       return GetOrCreateBrowser(profile);
     case NEW_POPUP: {
       // Make a new popup window.
       // Coerce app-style if |source| represents an app.
       std::string app_name;
       if (!params->extension_app_id.empty()) {
         app_name = web_app::GenerateApplicationNameFromExtensionId(
             params->extension_app_id);
       } else if (!params->browser->app_name().empty()) {
         app_name = params->browser->app_name();
-      } else if (params->source_contents &&
-                 params->source_contents->extension_tab_helper()->is_app()) {
-        app_name = web_app::GenerateApplicationNameFromExtensionId(
-            params->source_contents->extension_tab_helper()->
-                extension_app()->id());
+      } else if (params->source_contents) {
+        extensions::TabHelper* extensions_tab_helper =
+            extensions::TabHelper::FromWebContents(
+                params->source_contents->web_contents());
+        if (extensions_tab_helper->is_app()) {
+          app_name = web_app::GenerateApplicationNameFromExtensionId(
+              extensions_tab_helper->extension_app()->id());
+        }
       }
       if (app_name.empty()) {
         Browser::CreateParams browser_params(Browser::TYPE_POPUP, profile);
         browser_params.initial_bounds = params->window_bounds;
         return new Browser(browser_params);
       }
 
       return new Browser(Browser::CreateParams::CreateForApp(
           Browser::TYPE_POPUP, app_name, params->window_bounds, profile));
     }
@@ skipping 327 matching lines @@
       params->target_contents =
           chrome::TabContentsFactory(
               params->browser->profile(),
               tab_util::GetSiteInstanceForNewTab(
                   params->browser->profile(), url),
               MSG_ROUTING_NONE,
               source_contents);
       // This function takes ownership of |params->target_contents| until it
       // is added to a TabStripModel.
       target_contents_owner.TakeOwnership();
-      params->target_contents->extension_tab_helper()->
-          SetExtensionAppById(params->extension_app_id);
+      extensions::TabHelper::FromWebContents(
+          params->target_contents->web_contents())->
+              SetExtensionAppById(params->extension_app_id);
       // TODO(sky): figure out why this is needed. Without it we seem to get
       // failures in startup tests.
       // By default, content believes it is not hidden.  When adding contents
       // in the background, tell it that it's hidden.
       if ((params->tabstrip_add_types & TabStripModel::ADD_ACTIVE) == 0) {
         // TabStripModel::AddTabContents invokes WasHidden if not foreground.
         params->target_contents->web_contents()->WasHidden();
       }
     } else {
       // ... otherwise if we're loading in the current tab, the target is the
@@ skipping 92 matching lines @@
   return !(url.scheme() == chrome::kChromeUIScheme &&
       (url.host() == chrome::kChromeUISettingsHost ||
        url.host() == chrome::kChromeUISettingsFrameHost ||
        url.host() == chrome::kChromeUIExtensionsHost ||
        url.host() == chrome::kChromeUIBookmarksHost ||
        url.host() == chrome::kChromeUISyncPromoHost ||
        url.host() == chrome::kChromeUIUberHost));
 }
 
 }  // namespace chrome