Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/page_cycler/page_cycler.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/page_cycler/page_cycler.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/perf/perf_test.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 
 using content::NavigationController;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 PageCycler::PageCycler(Browser* browser,
                        const FilePath& urls_file)
-    : content::WebContentsObserver(browser->GetActiveWebContents()),
+    : content::WebContentsObserver(chrome::GetActiveWebContents(browser)),
       browser_(browser),
       urls_file_(urls_file),
       url_index_(0),
       aborted_(false) {
   BrowserList::AddObserver(this);
   AddRef();  // Balanced in Finish()/Abort() (only one should be called).
 }
 
 PageCycler::~PageCycler() {
 }
@@ skipping 79 matching lines @@
 }
 
 void PageCycler::BeginCycle() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   CHECK(browser_);
   // Upon launch, Chrome will automatically load the newtab page. This can
   // result in the browser being in a state of loading when PageCycler is ready
   // to start. Instead of interrupting the load, we wait for it to finish, and
   // will call LoadNextURL() from DidFinishLoad() or DidFailProvisionalLoad().
-  if (browser_->GetActiveWebContents()->IsLoading())
+  if (chrome::GetActiveWebContents(browser_)->IsLoading())
     return;
   LoadNextURL();
 }
 
 void PageCycler::LoadNextURL() {
   CHECK(browser_);
   if (url_index_ >= urls_.size()) {
     content::BrowserThread::PostBlockingPoolTask(
         FROM_HERE,
         base::Bind(&PageCycler::PrepareResultsOnBackgroundThread, this));
@@ skipping 108 matching lines @@
     aborted_ = true;
     error_.append(ASCIIToUTF16(
         "Browser was closed before the run was completed."));
     DLOG(WARNING) <<
         "Page Cycler: browser was closed before the run was completed.";
     content::BrowserThread::PostBlockingPoolTask(
         FROM_HERE,
         base::Bind(&PageCycler::PrepareResultsOnBackgroundThread, this));
   }
 }