Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/ui/views/frame/browser_view.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/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 1519 matching lines @@
   // For Ash only, app host windows do not show an icon, crbug.com/119411.
   // Child windows (e.g. extension panels, popups) do show an icon.
   if (browser_->is_app() && browser_->app_type() == Browser::APP_TYPE_HOST)
     return false;
 #endif
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 gfx::ImageSkia BrowserView::GetWindowAppIcon() {
   if (browser_->is_app()) {
-    TabContents* contents = chrome::GetActiveTabContents(browser_.get());
-    if (contents && contents->extension_tab_helper()->GetExtensionAppIcon())
-      return *contents->extension_tab_helper()->GetExtensionAppIcon();
+    WebContents* contents = chrome::GetActiveWebContents(browser_.get());
+    extensions::TabHelper* extensions_tab_helper =
+        contents ? extensions::TabHelper::FromWebContents(contents) : NULL;
+    if (extensions_tab_helper && extensions_tab_helper->GetExtensionAppIcon())
+      return *extensions_tab_helper->GetExtensionAppIcon();
   }
 
   return GetWindowIcon();
 }
 
 gfx::ImageSkia BrowserView::GetWindowIcon() {
   if (browser_->is_app())
     return browser_->GetCurrentPageIcon().AsImageSkia();
   return gfx::ImageSkia();
 }
@@ skipping 1069 matching lines @@
 
   Browser* modal_browser =
       browser::FindBrowserWithWebContents(active_dialog->web_contents());
   if (modal_browser && (browser_ != modal_browser)) {
     modal_browser->window()->FlashFrame(true);
     modal_browser->window()->Activate();
   }
 
   AppModalDialogQueue::GetInstance()->ActivateModalDialog();
 }