Remove WebContents methods that duplicate WebContentsView methods.

chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

 // 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/ui/cocoa/constrained_window/constrained_window_mac.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sheet.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_contents_view.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::NiceMock;
 
 namespace {
 
 class ConstrainedWindowDelegateMock : public ConstrainedWindowMacDelegate {
  public:
   MOCK_METHOD1(OnConstrainedWindowClosed, void(ConstrainedWindowMac*));
@@ skipping 65 matching lines @@
 // a tab works correctly.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, ShowInUninitializedTab) {
   scoped_ptr<content::WebContents> web_contents(content::WebContents::Create(
       content::WebContents::CreateParams(browser()->profile())));
   bool was_blocked = false;
   chrome::AddWebContents(browser(), NULL, web_contents.release(),
                          NEW_BACKGROUND_TAB, gfx::Rect(), false, &was_blocked);
   content::WebContents* tab2 =
       browser()->tab_strip_model()->GetWebContentsAt(2);
   ASSERT_TRUE(tab2);
-  EXPECT_FALSE([tab2->GetNativeView() superview]);
+  EXPECT_FALSE([tab2->GetView()->GetNativeView() superview]);
 
   // Show dialog and verify that it's not visible yet.
   NiceMock<ConstrainedWindowDelegateMock> delegate;
   ConstrainedWindowMac dialog(&delegate, tab2, sheet_);
   EXPECT_FALSE([sheet_window_ isVisible]);
 
   // Activate the tab and verify that the constrained window is shown.
   browser()->tab_strip_model()->ActivateTabAt(2, true);
-  EXPECT_TRUE([tab2->GetNativeView() superview]);
+  EXPECT_TRUE([tab2->GetView()->GetNativeView() superview]);
   EXPECT_TRUE([sheet_window_ isVisible]);
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
   dialog.CloseWebContentsModalDialog();
 }
 
 // Test that adding a sheet disables tab dragging.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, TabDragging) {
   NiceMock<ConstrainedWindowDelegateMock> delegate;
   ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
@@ skipping 38 matching lines @@
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
 
   // Dialog will delete it self when closed.
   NiceMock<ConstrainedWindowDelegateMock> delegate;
   ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
 
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
 
   dialog.CloseWebContentsModalDialog();
 }