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

Unified Diff: chrome/test/remoting/remote_desktop_browsertest.h

Issue 703453003: Update the expected URL for main.html of v2 app, used by remoting tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/remoting/remote_desktop_browsertest.h
diff --git a/chrome/test/remoting/remote_desktop_browsertest.h b/chrome/test/remoting/remote_desktop_browsertest.h
index 18b4d614b66599a1257b686f8f647c4973ea2732..a3506d4ad2a4b43788a431d90eabd17139158769 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.h
+++ b/chrome/test/remoting/remote_desktop_browsertest.h
@@ -223,7 +223,14 @@ class RemoteDesktopBrowserTest : public extensions::PlatformAppBrowserTest {
// Helper to construct the starting URL of the installed chromoting webapp.
GURL Chromoting_Main_URL() {
- return GURL("chrome-extension://" + ChromotingID() + "/main.html");
+ if (is_platform_app())
+ // The v2 remoting app recently (M38 at the latest) started adding a
+ // query-string parameter to the main extension page. So we'll create a
+ // different expected URL for it.
+ return GURL("chrome-extension://" + ChromotingID() +
+ "/main.html?isKioskSession=false");
+ else
+ return GURL("chrome-extension://" + ChromotingID() + "/main.html");
}
// Helper to retrieve the current URL in the active WebContents.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698