Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / browser_window_controller_browsertest.mm

diff --git a/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index d958862..b8620ea 100644 (file)
--- a/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/src/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -18,7 +18,6 @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
-#import "chrome/browser/ui/cocoa/browser/avatar_base_controller.h"
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
@@ -26,6 +25,7 @@
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/nsview_additions.h"
+#import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ -34,7 +34,6 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
 #import "testing/gtest_mac.h"
 
 namespace {
@@ -356,17 +355,17 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
 // visible.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        AllowOverlappingViewsHistoryOverlay) {
-  content::WebContentsView* web_contents_view =
-      browser()->tab_strip_model()->GetActiveWebContents()->GetView();
-  EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_TRUE(web_contents->GetAllowOverlappingViews());
 
   base::scoped_nsobject<HistoryOverlayController> overlay(
       [[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
-  [overlay showPanelForView:web_contents_view->GetNativeView()];
-  EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
+  [overlay showPanelForView:web_contents->GetNativeView()];
+  EXPECT_TRUE(web_contents->GetAllowOverlappingViews());
 
   overlay.reset();
-  EXPECT_TRUE(web_contents_view->GetAllowOverlappingViews());
+  EXPECT_TRUE(web_contents->GetAllowOverlappingViews());
 }
 
 // Tests that status bubble's base frame does move when devTools are docked.