Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/webui/net_internals/net_internals_ui_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 "chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/web_ui_browsertest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/address_list.h"
 #include "net/base/host_cache.h"
@@ skipping 211 matching lines @@
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL(loader_url),
       NEW_BACKGROUND_TAB,
       ui_test_utils::BROWSER_TEST_NONE);
 }
 
 void NetInternalsTest::MessageHandler::NavigateToPrerender(
     const ListValue* list_value) {
   content::RenderViewHost* host =
-      browser()->GetWebContentsAt(1)->GetRenderViewHost();
+      chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost();
   host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("Click()"));
 }
 
 void NetInternalsTest::MessageHandler::CreateIncognitoBrowser(
     const ListValue* list_value) {
   ASSERT_FALSE(incognito_browser_);
   incognito_browser_ = net_internals_test_->CreateIncognitoBrowser();
 
   // Tell the test harness that creation is complete.
   StringValue command_value("onIncognitoBrowserCreatedForTest");
   web_ui()->CallJavascriptFunction("g_browser.receive", command_value);
 }
 
 void NetInternalsTest::MessageHandler::CloseIncognitoBrowser(
     const ListValue* list_value) {
   ASSERT_TRUE(incognito_browser_);
-  incognito_browser_->CloseAllTabs();
+  chrome::CloseAllTabs(incognito_browser_);
   // Closing all a Browser's tabs will ultimately result in its destruction,
   // thought it may not have been destroyed yet.
   incognito_browser_ = NULL;
 }
 
 void NetInternalsTest::MessageHandler::EnableHttpPipelining(
     const ListValue* list_value) {
   bool enable;
   ASSERT_TRUE(list_value->GetBoolean(0, &enable));
   BrowserThread::PostTask(
@@ skipping 41 matching lines @@
 void NetInternalsTest::SetUpCommandLine(CommandLine* command_line) {
   WebUIBrowserTest::SetUpCommandLine(command_line);
   // Needed to test the prerender view.
   command_line->AppendSwitchASCII(switches::kPrerenderMode,
                                   switches::kPrerenderModeSwitchValueEnabled);
 }
 
 void NetInternalsTest::SetUpOnMainThread() {
   // Increase the memory allowed in a prerendered page above normal settings,
   // as debug builds use more memory and often go over the usual limit.
-  Profile* profile = browser()->GetActiveTabContents()->profile();
+  Profile* profile = browser()->profile();
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForProfile(profile);
   prerender_manager->mutable_config().max_bytes = 1000 * 1024 * 1024;
 }
 
 content::WebUIMessageHandler* NetInternalsTest::GetMockMessageHandler() {
   return message_handler_.get();
 }
 
 GURL NetInternalsTest::CreatePrerenderLoaderUrl(
@@ skipping 12 matching lines @@
   GURL url_loader = test_server()->GetURL(replacement_path);
   return url_loader;
 }
 
 bool NetInternalsTest::StartTestServer() {
   if (test_server_started_)
     return true;
   test_server_started_ = test_server()->Start();
   return test_server_started_;
 }