Update the expected URL for main.html of v2 app, used by remoting tests.

chrome/test/remoting/remote_desktop_browsertest.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
 #define CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_
 
 #include "base/debug/stack_trace.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 205 matching lines @@
   // Whether to perform the cleanup tasks (uninstalling chromoting, etc).
   // This is useful for diagnostic purposes.
   bool NoCleanup() { return no_cleanup_; }
 
   // Whether to install the chromoting extension before running the test cases.
   // This is useful for diagnostic purposes.
   bool NoInstall() { return no_install_; }
 
   // 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.
   GURL GetCurrentURL() {
     return active_web_contents()->GetURL();
   }
 
   // Helpers to execute JavaScript code on a web page.
 
   // Helper to execute a JavaScript code snippet in the active WebContents.
@@ skipping 135 matching lines @@
   std::string password_;
   std::string me2me_pin_;
   std::string remote_host_name_;
   std::string extension_name_;
   std::string http_server_;
 };
 
 }  // namespace remoting
 
 #endif  // CHROME_TEST_REMOTING_REMOTE_DESKTOP_BROWSERTEST_H_