Index: chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm |
diff --git a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm |
index e22f829e675b969709127b3a7162bf3a4da1c0d0..e0755ed054be0d26a054df6a161dcef9f84624ec 100644 |
--- a/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm |
+++ b/chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm |
@@ -5,6 +5,7 @@ |
#import "chrome/browser/ui/cocoa/dev_tools_controller.h" |
#include "chrome/browser/devtools/devtools_window.h" |
+#include "chrome/browser/devtools/devtools_window_testing.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_list.h" |
#include "chrome/browser/ui/browser_window.h" |
@@ -24,17 +25,11 @@ class DevToolsControllerTest : public InProcessBrowserTest { |
protected: |
void OpenDevToolsWindow() { |
devtools_window_ = |
- DevToolsWindow::OpenDevToolsWindowForTest(browser(), true); |
+ DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); |
} |
void CloseDevToolsWindow() { |
- content::WindowedNotificationObserver close_observer( |
- content::NOTIFICATION_WEB_CONTENTS_DESTROYED, |
- content::Source<content::WebContents>( |
- devtools_window_->web_contents_for_test())); |
- DevToolsWindow::ToggleDevToolsWindow( |
- browser(), DevToolsToggleAction::Toggle()); |
- close_observer.Wait(); |
+ DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window_); |
} |
content::WebContents* web_contents() { |
@@ -65,6 +60,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsControllerTest, AllowOverlappingViews) { |
// Without the find bar. |
browser()->GetFindBarController()->find_bar()->Hide(false); |
EXPECT_TRUE(devtools_web_contents()->GetAllowOverlappingViews()); |
+ |
+ CloseDevToolsWindow(); |
} |
// Verify that AllowOtherViews is set when and only when DevTools is visible. |