Add support for deferring app initialization when testing.

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 68 matching lines @@
 
   // Install the unpacked chromoting extension.
   void InstallChromotingAppUnpacked();
 
   // Uninstall the chromoting extension.
   void UninstallChromotingApp();
 
   // Test whether the chromoting extension is installed.
   void VerifyChromotingLoaded(bool expected);
 
-  // Launch the chromoting app.
-  void LaunchChromotingApp();
+  // Launch the Chromoting app. If |defer_start| is true, an additional URL
+  // parameter is passed to the application, causing it to defer start-up
+  // until StartChromotingApp is invoked. Test code can execute arbitrary
+  // JavaScript in the context of the app between these two calls, for example
+  // to set up appropriate mocks.
+  void LaunchChromotingApp(bool defer_start);
+
+  // If the Chromoting app was launched in deferred mode, tell it to continue
+  // its regular start-up sequence.
+  void StartChromotingApp();
 
   // Authorize: grant extended access permission to the user's computer.
   void Authorize();
 
   // Authenticate: sign in to google using the credentials provided.
   void Authenticate();
 
   // Approve: grant the chromoting app necessary permissions.
   void Approve();
 
@@ skipping 115 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() {
-    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");
+    return GURL("chrome-extension://" + ChromotingID() + "/main.html");

[weitao, 2014/12/12 22:49:52]

Does the V2 app no longer include isKioskSession in its url? Or does this
correspond to the change in GetCurrentURL() below?

[Jamie, 2014/12/13 01:03:43]

Yes it does, but I've modified the URL matcher to ignore parameters (since the
parameters depend on whether the app is being started in deferred mode or not).

   }
 
-  // Helper to retrieve the current URL in the active WebContents.
+  // Helper to retrieve the current URL in the active WebContents. This function
+  // strips all query parameters from the URL.
   GURL GetCurrentURL() {
-    return active_web_contents()->GetURL();
+    GURL current_url = active_web_contents()->GetURL();
+    GURL::Replacements strip_query;
+    strip_query.ClearQuery();
+    return current_url.ReplaceComponents(strip_query);
   }
 
   // Helpers to execute JavaScript code on a web page.
 
   // Helper to execute a JavaScript code snippet in the active WebContents.
   void ExecuteScript(const std::string& script);
 
   // Helper to execute a JavaScript code snippet in the active WebContents
   // and wait for page load to complete.
   void ExecuteScriptAndWaitForAnyPageLoad(const std::string& script);
@@ skipping 133 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_