Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/media_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/basictypes.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/test/layout_browsertest.h"
 #include "googleurl/src/gurl.h"
 
 class MediaTest : public InProcessBrowserTest {
  protected:
   GURL GetTestURL(const char* tag, const char* media_file) {
     FilePath test_file_path = ui_test_utils::GetTestFilePath(
         FilePath(FILE_PATH_LITERAL("media")),
         FilePath(FILE_PATH_LITERAL("player.html")));
     std::string query = base::StringPrintf("%s=%s", tag, media_file);
     return ui_test_utils::GetFileUrlWithQuery(test_file_path, query);
   }
 
   void PlayMedia(const char* tag, const char* media_file) {
     GURL player_gurl = GetTestURL(tag, media_file);
 
     // Allow the media file to be loaded.
     const string16 kPlaying = ASCIIToUTF16("PLAYING");
     const string16 kFailed = ASCIIToUTF16("FAILED");
     const string16 kError = ASCIIToUTF16("ERROR");
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetActiveWebContents(), kPlaying);
+        chrome::GetActiveWebContents(browser()), kPlaying);
     title_watcher.AlsoWaitForTitle(kFailed);
     title_watcher.AlsoWaitForTitle(kError);
 
     ui_test_utils::NavigateToURL(browser(), player_gurl);
 
     string16 final_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(kPlaying, final_title);
   }
 
   void PlayAudio(const char* url) {
@@ skipping 104 matching lines @@
 }
 
 // TODO(dalecurtis): Disabled because loop is flaky.  http://crbug.com/134021
 // IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
 //   RunLayoutTest("video-loop.html");
 // }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
   RunLayoutTest("video-no-autoplay.html");
 }