Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7122)

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

Issue 395783002: [DevTools] Move DevToolsWindow testing code to a separate class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, added cleanup to some tests Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index 7ba3a715ab30e44b9097d26f5aa78824e94d662a..4c4f9d98efbef99eaa562f49361e62b1f868b1d0 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -9,7 +9,7 @@
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/devtools/devtools_window.h"
+#include "chrome/browser/devtools/devtools_window_testing.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
#include "chrome/browser/profiles/profile.h"
@@ -134,11 +134,6 @@ class BrowserWindowControllerTest : public InProcessBrowserTest {
return height;
}
- void SetDevToolsWindowContentsBounds(
- DevToolsWindow* window, const gfx::Rect& bounds) {
- window->SetInspectedPageBounds(bounds);
- }
-
private:
DISALLOW_COPY_AND_ASSIGN(BrowserWindowControllerTest);
};
@@ -366,10 +361,13 @@ IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
StatusBubblePositioning) {
NSPoint origin = [controller() statusBubbleBaseFrame].origin;
- DevToolsWindow* devtools_window = DevToolsWindow::OpenDevToolsWindowForTest(
- browser(), true);
- SetDevToolsWindowContentsBounds(devtools_window, gfx::Rect(10, 10, 100, 100));
+ DevToolsWindow* devtools_window =
+ DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true);
+ DevToolsWindowTesting::Get(devtools_window)->SetInspectedPageBounds(
+ gfx::Rect(10, 10, 100, 100));
NSPoint originWithDevTools = [controller() statusBubbleBaseFrame].origin;
EXPECT_FALSE(NSEqualPoints(origin, originWithDevTools));
+
+ DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
}
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/cocoa/dev_tools_controller_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698