Move SessionID, CaptureVisibleTabFunction to WebContents.

chrome/browser/extensions/extension_tab_util.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/extension_tab_util.h"
 
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ skipping 31 matching lines @@
     const TabStripModel* tab_strip_model) {
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end(); ++it) {
     if ((*it)->tab_strip_model() == tab_strip_model)
       return GetWindowId(*it);
   }
   return -1;
 }
 
 int ExtensionTabUtil::GetTabId(const WebContents* web_contents) {
-  return SessionID::IdForTab(TabContents::FromWebContents(web_contents));
+  return SessionID::IdForTab(web_contents);
 }
 
 std::string ExtensionTabUtil::GetTabStatusText(bool is_loading) {
   return is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete;
 }
 
 int ExtensionTabUtil::GetWindowIdOfTab(const WebContents* web_contents) {
-  return SessionID::IdForWindowContainingTab(
-      TabContents::FromWebContents(web_contents));
+  return SessionID::IdForWindowContainingTab(web_contents);
 }
 
 DictionaryValue* ExtensionTabUtil::CreateTabValue(
     const WebContents* contents,
     const Extension* extension) {
   // Find the tab strip and index of this guy.
   TabStripModel* tab_strip = NULL;
   int tab_index;
   if (ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index)) {
     return ExtensionTabUtil::CreateTabValue(contents,
@@ skipping 140 matching lines @@
       include_incognito && profile->HasOffTheRecordProfile() ?
           profile->GetOffTheRecordProfile() : NULL;
   for (BrowserList::const_iterator iter = BrowserList::begin();
        iter != BrowserList::end(); ++iter) {
     Browser* target_browser = *iter;
     if (target_browser->profile() == profile ||
         target_browser->profile() == incognito_profile) {
       TabStripModel* target_tab_strip = target_browser->tab_strip_model();
       for (int i = 0; i < target_tab_strip->count(); ++i) {
         TabContents* target_contents = target_tab_strip->GetTabContentsAt(i);
-        if (SessionID::IdForTab(target_contents) == tab_id) {
+        if (SessionID::IdForTab(target_contents->web_contents()) == tab_id) {
           if (browser)
             *browser = target_browser;
           if (tab_strip)
             *tab_strip = target_tab_strip;
           if (contents)
             *contents = target_contents;
           if (tab_index)
             *tab_index = i;
           return true;
         }
@@ skipping 64 matching lines @@
 
 // static
 extensions::WindowController* ExtensionTabUtil::GetWindowControllerOfTab(
     const WebContents* web_contents) {
   Browser* browser = browser::FindBrowserWithWebContents(web_contents);
   if (browser != NULL)
     return browser->extension_window_controller();
 
   return NULL;
 }