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

Unified Diff: chrome/test/remoting/fullscreen_browsertest.cc

Issue 838543002: Implement browser test for It2Me (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 11 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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/remoting/it2me_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/remoting/fullscreen_browsertest.cc
diff --git a/chrome/test/remoting/fullscreen_browsertest.cc b/chrome/test/remoting/fullscreen_browsertest.cc
index 40819cdc6ff1ad9ba20ddbf7b7461d615db45c3a..58b2a41e90bd517ba5a9156452197d703d1960e6 100644
--- a/chrome/test/remoting/fullscreen_browsertest.cc
+++ b/chrome/test/remoting/fullscreen_browsertest.cc
@@ -33,7 +33,7 @@ bool FullscreenBrowserTest::WaitForFullscreenChange(bool expect_fullscreen) {
}
IN_PROC_BROWSER_TEST_F(FullscreenBrowserTest, MANUAL_Me2Me_Fullscreen) {
- SetUpTestForMe2Me();
+ SetUpTest();
ConnectToLocalHost(false);
// Verify that we're initially not full-screen.
@@ -62,9 +62,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenBrowserTest, MANUAL_Me2Me_Fullscreen) {
}
IN_PROC_BROWSER_TEST_F(FullscreenBrowserTest, MANUAL_Me2Me_Bump_Scroll) {
- SetUpTestForMe2Me();
-
- content::WebContents* content = app_web_content();
+ content::WebContents* content = SetUpTest();
LoadScript(content, FILE_PATH_LITERAL("bump_scroll_browser_test.js"));
RunJavaScriptTest(content, "Bump_Scroll", "{pin: '" + me2me_pin() + "'}");
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/remoting/it2me_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698