Remove WebContents methods that duplicate WebContentsView methods.

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_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_switches.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"
+#include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.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/compositor/compositor_setup.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 351 matching lines @@
     return true;
   }
 
   // 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()->tab_strip_model()->GetActiveWebContents()->GetContainerBounds(
-        &tab_contents_bounds);
+    browser()->tab_strip_model()->GetActiveWebContents()->GetView()->
+        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 (!chrome::GrabWindowSnapshotForUser(native_window, &png,
                                            snapshot_bounds)) {
       LOG(ERROR) << "browser::GrabWindowSnapShot() failed";
@@ skipping 132 matching lines @@
     {160, 100, 0, 0, 0}
   };
   const size_t ref_pixel_count = sizeof(ref_pixels) / sizeof(ReferencePixel);
 
   gfx::Size container_size(400, 300);
   base::FilePath url =
       test_data_dir().AppendASCII("pixel_canvas2d.html");
   RunPixelTest(container_size, url, ref_img_revision_update,
                ref_pixels, ref_pixel_count);
 }