Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/debugger/devtools_sanity_browsertest.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/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_client_host.h"
@@ skipping 109 matching lines @@
 
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     inspected_rvh_ = GetInspectedTab()->GetRenderViewHost();
     window_ = DevToolsWindow::OpenDevToolsWindow(inspected_rvh_);
     observer.Wait();
   }
 
   WebContents* GetInspectedTab() {
-    return browser()->GetWebContentsAt(0);
+    return chrome::GetWebContentsAt(browser(), 0);
   }
 
   void CloseDevToolsWindow() {
     DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
     // UnregisterDevToolsClientHostFor may destroy window_ so store the browser
     // first.
     Browser* browser = window_->browser();
     DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
         inspected_rvh_);
     devtools_manager->UnregisterDevToolsClientHostFor(agent);
@@ skipping 239 matching lines @@
       ui_test_utils::WindowedNotificationObserver observer(
           content::NOTIFICATION_LOAD_STOP,
           content::Source<NavigationController>(
               &client_contents->GetController()));
       observer.Wait();
     }
   }
 
   void CloseDevToolsWindow() {
     Browser* browser = window_->browser();
-    browser->CloseAllTabs();
+    chrome::CloseAllTabs(browser);
     BrowserClosedObserver close_observer(browser);
   }
 
   DevToolsWindow* window_;
 };
 
 
 // Tests scripts panel showing.
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
   RunTest("testShowScriptsTab", kDebuggerTestPage);
@@ skipping 107 matching lines @@
 #endif
 // Tests that inspector will reattach to inspected page when it is reloaded
 // after a crash. See http://crbug.com/101952
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestReattachAfterCrash) {
   OpenDevToolsWindow(kDebuggerTestPage);
 
   ui_test_utils::CrashTab(GetInspectedTab());
   ui_test_utils::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
-          &browser()->GetActiveWebContents()->GetController()));
+          &chrome::GetActiveWebContents(browser())->GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   observer.Wait();
 
   RunTestFunction(window_, "testReattachAfterCrash");
   CloseDevToolsWindow();
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPageWithNoJavaScript) {
   OpenDevToolsWindow("about:blank");
   std::string result;
@@ skipping 57 matching lines @@
                                         content::CONSOLE_MESSAGE_LEVEL_LOG,
                                         "log");
   devtools_manager->AddMessageToConsole(agent_host,
                                         content::CONSOLE_MESSAGE_LEVEL_ERROR,
                                         "error");
   RunTestFunction(window_, "checkLogAndErrorMessages");
   CloseDevToolsWindow();
 }
 
 }  // namespace