Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/extensions/extension_devtools_browsertests.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 "base/memory/ref_counted.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_devtools_browsertest.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_util.h"
@@ skipping 36 matching lines @@
   // Get the ExtensionHost that is hosting our background page.
   ExtensionProcessManager* manager =
       browser()->profile()->GetExtensionProcessManager();
   ExtensionHost* host = FindBackgroundHostWithPath(manager,
                                                    "/background.html", 1);
 
   // Grab a handle to the DevToolsManager so we can forward messages to it.
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
 
   // Grab the tab_id of whatever tab happens to be first.
-  WebContents* web_contents = browser()->GetWebContentsAt(0);
+  WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0);
   ASSERT_TRUE(web_contents);
   int tab_id = ExtensionTabUtil::GetTabId(web_contents);
 
   // Test setup.
   bool result = false;
   std::wstring register_listeners_js = base::StringPrintf(
       L"setListenersOnTab(%d)", tab_id);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", register_listeners_js, &result));
   EXPECT_TRUE(result);
@@ skipping 38 matching lines @@
 
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api_two")));
   ExtensionHost* host_two = FindBackgroundHostWithPath(manager,
                                                        "/background_two.html",
                                                        2);
 
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
 
   // Grab the tab_id of whatever tab happens to be first.
-  WebContents* web_contents = browser()->GetWebContentsAt(0);
+  WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0);
   ASSERT_TRUE(web_contents);
   int tab_id = ExtensionTabUtil::GetTabId(web_contents);
 
   // Test setup.
   bool result = false;
   std::wstring register_listeners_js = base::StringPrintf(
       L"setListenersOnTab(%d)", tab_id);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_one->render_view_host(), L"", register_listeners_js, &result));
   EXPECT_TRUE(result);
@@ skipping 24 matching lines @@
   // Removing the listeners from the second extension should tear the bridge
   // down.
   result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_two->render_view_host(), L"", L"unregisterListeners()", &result));
   EXPECT_TRUE(result);
   ASSERT_FALSE(devtools_manager->GetDevToolsClientHostFor(
       DevToolsAgentHostRegistry::GetDevToolsAgentHost(
           web_contents->GetRenderViewHost())));
 }