Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/test/gpu/gpu_pixel_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/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.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/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 137 matching lines @@
     message_queue.ClearQueue();
 
     gfx::Rect new_bounds = GetNewTabContainerBounds(tab_container_size);
 
     std::wostringstream js_call;
     js_call << "preCallResizeInChromium(";
     js_call << new_bounds.width() << ", " << new_bounds.height();
     js_call << ");";
 
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
-        browser()->GetActiveWebContents()->GetRenderViewHost(),
+        chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
         L"", js_call.str()));
 
     std::string message;
     ASSERT_TRUE(message_queue.WaitForMessage(&message));
     message_queue.ClearQueue();
     browser()->window()->SetBounds(new_bounds);
 
     // Wait for message from test page indicating the rendering is done.
     while (message.compare("\"resized\"")) {
       ASSERT_TRUE(message_queue.WaitForMessage(&message));
@@ skipping 186 matching lines @@
                   << img_diff_path.value();
       }
     }
     return rt;
   }
 
   // Returns a gfx::Rect representing the bounds that the browser window should
   // have if the tab contents have the desired size.
   gfx::Rect GetNewTabContainerBounds(const gfx::Size& desired_size) {
     gfx::Rect container_rect;
-    browser()->GetActiveWebContents()->GetContainerBounds(&container_rect);
+    chrome::GetActiveWebContents(browser())->GetContainerBounds(&container_rect);
     // Size cannot be negative, so use a point.
     gfx::Point correction(
         desired_size.width() - container_rect.size().width(),
         desired_size.height() - container_rect.size().height());
 
     gfx::Rect window_rect = browser()->window()->GetRestoredBounds();
     gfx::Size new_size = window_rect.size();
     new_size.Enlarge(correction.x(), correction.y());
     window_rect.set_size(new_size);
     return window_rect;
   }
 
   // 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 95 matching lines @@
 IN_PROC_BROWSER_TEST_F(Canvas2DPixelTestSD, Canvas2DRedBoxSD) {
   // If test baseline needs to be updated after a given revision, update the
   // following number. If no revision requirement, then 0.
   const int64 ref_img_revision_update = 123489;
 
   gfx::Size container_size(400, 300);
   FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update);
 }