Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/test/perf/rendering/throughput_tests.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/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/values.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/perf/browser_perf_test.h"
 #include "chrome/test/perf/perf_test.h"
@@ skipping 175 matching lines @@
     ui_test_utils::RunThisRunLoop(&run_loop);
   }
 
   // Take snapshot of the current tab, encode it as PNG, and save to a SkBitmap.
   bool TabSnapShotToImage(SkBitmap* bitmap) {
     CHECK(bitmap);
     std::vector<unsigned char> png;
 
     gfx::Rect root_bounds = browser()->window()->GetBounds();
     gfx::Rect tab_contents_bounds;
-    browser()->GetActiveWebContents()->GetContainerBounds(
+    chrome::GetActiveWebContents(browser())->GetContainerBounds(
         &tab_contents_bounds);
 
     gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(),
                               tab_contents_bounds.y() - root_bounds.y(),
                               tab_contents_bounds.width(),
                               tab_contents_bounds.height());
 
     gfx::NativeWindow native_window = browser()->window()->GetNativeWindow();
     if (!browser::GrabWindowSnapshot(native_window, &png, snapshot_bounds)) {
       LOG(ERROR) << "browser::GrabWindowSnapShot() failed";
@@ skipping 85 matching lines @@
     if (flags & kAllowExternalDNS)
       AllowExternalDNS();
 
     std::string json_events;
     TraceEventVector events_sw, events_gpu;
     scoped_ptr<TraceAnalyzer> analyzer;
 
     LOG(INFO) << gurl_.possibly_invalid_spec();
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), gurl_, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
-    ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents());
+    ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser()));
 
     // Let the test spin up.
     LOG(INFO) << "Spinning up test...";
     ASSERT_TRUE(tracing::BeginTracing("test_gpu"));
     Wait(spinup_time_ms_);
     ASSERT_TRUE(tracing::EndTracing(&json_events));
 
     // Wait for a pixel color to change (if requested).
     WaitForPixelColor();
 
@@ skipping 40 matching lines @@
     std::string mean_and_error = base::StringPrintf("%f,%f", mean_ms,
                                                     std_dev_ms);
     perf_test::PrintResultMeanAndError(test_name, "", trace_name,
                                        mean_and_error, "frame_time", true);
 
     if (flags & kAllowExternalDNS)
       ResetAllowExternalDNS();
 
     // Close the tab so that we can quit without timing out during the
     // wait-for-idle stage in browser_test framework.
-    browser()->GetActiveWebContents()->Close();
+    chrome::GetActiveWebContents(browser())->Close();
   }
 
  private:
   // WaitPixel checks a color against the color at the given pixel coordinates
   // of an SkBitmap.
   class WaitPixel {
    enum Operator {
      EQUAL,
      NOT_EQUAL
    };
@@ skipping 160 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasManyImagesSW) {
   RunCanvasBenchTest("many_images", kNone);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasManyImagesGPU) {
   RunCanvasBenchTest("many_images", kNone | kIsGpuCanvasTest);
 }
 
 }  // namespace