Move SessionID, CaptureVisibleTabFunction to WebContents.

chrome/browser/extensions/tab_helper.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/extensions/tab_helper.h"
 
 #include "chrome/browser/extensions/app_notify_channel_ui.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 46 matching lines @@
     : content::WebContentsObserver(web_contents),
       extension_app_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           extension_function_dispatcher_(
               Profile::FromBrowserContext(web_contents->GetBrowserContext()),
               this)),
       pending_web_app_action_(NONE),
       script_executor_(web_contents),
       active_tab_permission_manager_(
           web_contents,
-          SessionID::IdForTab(TabContents::FromWebContents(web_contents)),
+          SessionID::IdForTab(web_contents),
           Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
   if (switch_utils::AreScriptBadgesEnabled()) {
     location_bar_controller_.reset(
         new ScriptBadgeController(web_contents, &script_executor_));
   } else {
     location_bar_controller_.reset(
         new PageActionController(web_contents));
   }
   registrar_.Add(this,
                  content::NOTIFICATION_LOAD_STOP,
@@ skipping 52 matching lines @@
 }
 
 SkBitmap* TabHelper::GetExtensionAppIcon() {
   if (extension_app_icon_.empty())
     return NULL;
 
   return &extension_app_icon_;
 }
 
 void TabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
-                                SessionID::IdForTab(tab_contents)));
+                                SessionID::IdForTab(web_contents())));
 }
 
 void TabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
-  TabContents* tab_contents = TabContents::FromWebContents(web_contents());
   for (ExtensionSet::const_iterator it = service->extensions()->begin();
        it != service->extensions()->end(); ++it) {
     ExtensionAction* browser_action = (*it)->browser_action();
     if (browser_action) {
-      browser_action->ClearAllValuesForTab(SessionID::IdForTab(tab_contents));
+      browser_action->ClearAllValuesForTab(SessionID::IdForTab(web_contents()));
       content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
           content::Source<ExtensionAction>(browser_action),
           content::NotificationService::NoDetails());
     }
   }
 }
 
 bool TabHelper::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
@@ skipping 274 matching lines @@
     // malware site etc). When this happens, we abort the shortcut update.
     NavigationEntry* entry = controller.GetLastCommittedEntry();
     if (entry)
       GetApplicationInfo(entry->GetPageID());
     else
       pending_web_app_action_ = NONE;
   }
 }
 
 }  // namespace extensions