Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/test/ui/ppapi_uitest.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/test/ui/ppapi_uitest.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabstrip.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/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
@@ skipping 210 matching lines @@
   return test_name;
 }
 
 void PPAPITestBase::RunTestURL(const GURL& test_url) {
   // See comment above TestingInstance in ppapi/test/testing_instance.h.
   // Basically it sends messages using the DOM automation controller. The
   // value of "..." means it's still working and we should continue to wait,
   // any other value indicates completion (in this case it will start with
   // "PASS" or "FAIL"). This keeps us from timing out on waits for long tests.
   TestFinishObserver observer(
-      browser()->GetActiveWebContents()->GetRenderViewHost(), kTimeoutMs);
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), kTimeoutMs);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out.";
 
   EXPECT_STREQ("PASS", observer.result().c_str());
 }
 
 void PPAPITestBase::RunHTTPTestServer(
     const FilePath& document_root,
@@ skipping 822 matching lines @@
   GURL url = GetTestFileUrl("View_CreatedInvisible");
   browser::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK);
   params.disposition = NEW_BACKGROUND_TAB;
   ui_test_utils::NavigateToURL(&params);
 }
 
 // This test messes with tab visibility so is custom.
 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) {
   // The plugin will be loaded in the foreground tab and will send us a message.
   TestFinishObserver observer(
-      browser()->GetActiveWebContents()->GetRenderViewHost(),
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       TestTimeouts::action_max_timeout_ms());
 
   GURL url = GetTestFileUrl("View_PageHideShow");
   ui_test_utils::NavigateToURL(browser(), url);
 
   ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out.";
   EXPECT_STREQ("TestPageHideShow:Created", observer.result().c_str());
   observer.Reset();
 
   // Make a new tab to cause the original one to hide, this should trigger the
   // next phase of the test.
   browser::NavigateParams params(
       browser(), GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   ui_test_utils::NavigateToURL(&params);
 
   // Wait until the test acks that it got hidden.
   ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out.";
   EXPECT_STREQ("TestPageHideShow:Hidden", observer.result().c_str());
 
   // Wait for the test completion event.
   observer.Reset();
 
   // Switch back to the test tab.
-  browser()->ActivateTabAt(0, true);
+  chrome::ActivateTabAt(browser(), 0, true);
 
   ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out.";
   EXPECT_STREQ("PASS", observer.result().c_str());
 }
 
 // Tests that if a plugin accepts touch events, the browser knows to send touch
 // events to the renderer.
 IN_PROC_BROWSER_TEST_F(PPAPITest, InputEvent_AcceptTouchEvent) {
   std::string positive_tests[] = { "InputEvent_AcceptTouchEvent_1",
                                    "InputEvent_AcceptTouchEvent_3",
                                    "InputEvent_AcceptTouchEvent_4"
                                  };
 
   for (size_t i = 0; i < arraysize(positive_tests); ++i) {
-    RenderViewHost* host = browser()->GetActiveWebContents()->
+    RenderViewHost* host = chrome::GetActiveWebContents(browser())->
         GetRenderViewHost();
     RunTest(positive_tests[i]);
     EXPECT_TRUE(content::RenderViewHostTester::HasTouchEventHandler(host));
   }
 
   std::string negative_tests[] = { "InputEvent_AcceptTouchEvent_2" };
   for (size_t i = 0; i < arraysize(negative_tests); ++i) {
-    RenderViewHost* host = browser()->GetActiveWebContents()->
+    RenderViewHost* host = chrome::GetActiveWebContents(browser())->
         GetRenderViewHost();
     RunTest(negative_tests[i]);
     EXPECT_FALSE(content::RenderViewHostTester::HasTouchEventHandler(host));
   }
 }
 
 TEST_PPAPI_IN_PROCESS(View_SizeChange);
 TEST_PPAPI_OUT_OF_PROCESS(View_SizeChange);
 TEST_PPAPI_NACL_VIA_HTTP(View_SizeChange);
 TEST_PPAPI_IN_PROCESS(View_ClipChange);
@@ skipping 15 matching lines @@
 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit)
 
 TEST_PPAPI_IN_PROCESS(MouseCursor)
 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor)
 
 // Only enabled in out-of-process mode.
 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
 
 #endif // ADDRESS_SANITIZER