Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/gpu_pixel_browsertest.cc

 // Copyright (c) 2011 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_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/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/test/gfx_test_utils.h"
 
 #if defined(USE_WEBKIT_COMPOSITOR)
@@ skipping 32 matching lines @@
         file_path, reinterpret_cast<char*>(&png_data[0]), png_data.size());
     if (bytes_written == static_cast<int>(png_data.size()))
       return true;
   }
   return false;
 }
 
 // Resizes the browser window so that the tab's contents are at a given size.
 void ResizeTabContainer(Browser* browser, const gfx::Size& desired_size) {
   gfx::Rect container_rect;
-  browser->GetSelectedTabContents()->GetContainerBounds(&container_rect);
+  browser->GetSelectedWebContents()->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);
   browser->window()->SetBounds(window_rect);
 }
@@ skipping 234 matching lines @@
   gfx::Size container_size(500, 500);
   ResizeTabContainer(browser(), container_size);
 
   // Wait for message from teapot page indicating the GL calls have been issued.
   ASSERT_TRUE(message_queue.WaitForMessage(NULL));
 
   std::vector<unsigned char> screenshot_png;
 
   gfx::Rect root_bounds = browser()->window()->GetBounds();
   gfx::Rect tab_contents_bounds;
-  browser()->GetSelectedTabContents()->GetContainerBounds(&tab_contents_bounds);
+  browser()->GetSelectedWebContents()->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()->GetNativeHandle();
   bool success = browser::GrabWindowSnapshot(native_window, &screenshot_png,
                                              snapshot_bounds);
   ASSERT_TRUE(success);
 
   SkBitmap bitmap;
   success = gfx::PNGCodec::Decode(
       reinterpret_cast<unsigned char*>(&*screenshot_png.begin()),
       screenshot_png.size(),
       &bitmap);
 
   ASSERT_TRUE(success);
   ASSERT_TRUE(CompareImages(bitmap));
 }