| Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| index b02929610bb06ca38d7be4a217241e8d55800346..3a278f30cf0353cd0f1d7ee7e2abf9b77e933afb 100644
|
| --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "content/browser/web_contents/navigation_controller_impl.h"
|
| #include "content/browser/web_contents/navigation_entry_impl.h"
|
| #include "content/browser/web_contents/web_contents_impl.h"
|
| +#include "content/public/browser/web_contents_view.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/test/browser_test_utils.h"
|
| #include "content/public/test/test_utils.h"
|
| @@ -84,7 +85,8 @@ class WebContentsViewAuraTest : public ContentBrowserTest {
|
| ASSERT_TRUE(test_server()->Start());
|
| GURL test_url(test_server()->GetURL(url));
|
| NavigateToURL(shell(), test_url);
|
| - aura::Window* content = shell()->web_contents()->GetContentNativeView();
|
| + aura::Window* content =
|
| + shell()->web_contents()->GetView()->GetContentNativeView();
|
| content->GetRootWindow()->SetHostSize(gfx::Size(800, 600));
|
| }
|
|
|
| @@ -116,7 +118,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest {
|
| EXPECT_TRUE(controller.CanGoBack());
|
| EXPECT_FALSE(controller.CanGoForward());
|
|
|
| - aura::Window* content = web_contents->GetContentNativeView();
|
| + aura::Window* content = web_contents->GetView()->GetContentNativeView();
|
| gfx::Rect bounds = content->GetBoundsInRootWindow();
|
| aura::test::EventGenerator generator(content->GetRootWindow(), content);
|
|
|
| @@ -219,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
|
| web_contents->GetController().GoBack();
|
| EXPECT_EQ(1, GetCurrentIndex());
|
|
|
| - aura::Window* content = web_contents->GetContentNativeView();
|
| + aura::Window* content = web_contents->GetView()->GetContentNativeView();
|
| aura::RootWindow* root_window = content->GetRootWindow();
|
| gfx::Rect bounds = content->GetBoundsInRootWindow();
|
|
|
| @@ -321,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
|
| // index 3 to index 2, and index 3 should have a screenshot.
|
| string16 expected_title = ASCIIToUTF16("Title: #2");
|
| content::TitleWatcher title_watcher(web_contents, expected_title);
|
| - aura::Window* content = web_contents->GetContentNativeView();
|
| + aura::Window* content = web_contents->GetView()->GetContentNativeView();
|
| gfx::Rect bounds = content->GetBoundsInRootWindow();
|
| aura::test::EventGenerator generator(content->GetRootWindow(), content);
|
| generator.GestureScrollSequence(
|
|
|