Move SessionID, CaptureVisibleTabFunction to WebContents.

chrome/browser/extensions/api/extension_action/script_badge_apitest.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/browser_event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 25 matching lines @@
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
   ExtensionAction* script_badge = extension->script_badge();
   ASSERT_TRUE(script_badge);
   const extensions::LocationBarController* location_bar_controller =
       extensions::TabHelper::FromWebContents(
           chrome::GetActiveWebContents(browser()))->
               location_bar_controller();
 
   const int tab_id = SessionID::IdForTab(
-      chrome::GetActiveTabContents(browser()));
+      chrome::GetActiveWebContents(browser()));
   EXPECT_EQ(GURL(extension->GetResourceURL("default_popup.html")),
             script_badge->GetPopupUrl(tab_id));
 
   EXPECT_FALSE(script_badge->GetIsVisible(tab_id));
   EXPECT_THAT(location_bar_controller->GetCurrentActions(),
               testing::ElementsAre());
 
   {
     ResultCatcher catcher;
     // Tell the extension to update the script badge state.
@@ skipping 19 matching lines @@
     ResultCatcher catcher;
     // Visit a non-extension page so the extension can run a content script and
     // cause the script badge to be animated in.
     ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(""));
     ASSERT_TRUE(catcher.GetNextResult());
   }
   EXPECT_TRUE(script_badge->GetIsVisible(tab_id));
   EXPECT_THAT(location_bar_controller->GetCurrentActions(),
               testing::ElementsAre(script_badge));
 }