Add support for deferring app initialization when testing.

chrome/test/remoting/remote_desktop_browsertest.cc

Index: chrome/test/remoting/remote_desktop_browsertest.cc
diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc
index d5f3ee107cc3aec1b11bdd7ec4518fa60dae9f88..055394755f76401fdbe9b3aba7df55cad6417b55 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.cc
+++ b/chrome/test/remoting/remote_desktop_browsertest.cc
@@ -166,7 +166,7 @@ void RemoteDesktopBrowserTest::VerifyChromotingLoaded(bool expected) {
   ASSERT_EQ(installed, expected);
 }
 
-void RemoteDesktopBrowserTest::LaunchChromotingApp() {
+void RemoteDesktopBrowserTest::LaunchChromotingApp(bool defer_start) {
   ASSERT_TRUE(extension_);
 
   GURL chromoting_main = Chromoting_Main_URL();
@@ -174,6 +174,16 @@ void RemoteDesktopBrowserTest::LaunchChromotingApp() {
   // loaded could be the generated background page. We need to wait
   // till the chromoting main page is loaded.
   PageLoadNotificationObserver observer(chromoting_main);
+  observer.set_ignore_url_parameters(true);
+
+  // Start the app in deferred mode by setting a URL parameter.
+  scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_trace_app_source;
+  if (defer_start) {
+    enable_trace_app_source.reset(
+        new extensions::FeatureSwitch::ScopedOverride(
+            extensions::FeatureSwitch::trace_app_source(),
+            true));
+  }

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

Where is the "test" URL parameter added?

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

extensions::FeatureSwitch::trace_app_source() is a command-line option that
causes apps to be launched with a |source| URL parameter. The source is
specified in AppLaunchParams; specifically, in this case it's specified on line
193. If |defer_start| is true, we force that parameter to true.

[weitao, 2014/12/16 01:06:27]

I see. The combination of trace_app_source being true and SOURCE_TEST passed to
AppLaunchParams will add "source='test'" to the URL. It took me a moment to
understand that. Could you please add a short comment explaining that?

[Jamie, 2014/12/16 01:33:51]

Done.

 
   OpenApplication(AppLaunchParams(browser()->profile(), extension_,
                                   is_platform_app()
@@ -210,6 +220,10 @@ void RemoteDesktopBrowserTest::LaunchChromotingApp() {
   EXPECT_EQ(Chromoting_Main_URL(), GetCurrentURL());
 }
 
+void RemoteDesktopBrowserTest::StartChromotingApp() {
+  ClickOnControl("browser-test-continue-init");
+};
+
 void RemoteDesktopBrowserTest::Authorize() {
   // The chromoting extension should be installed.
   ASSERT_TRUE(extension_);
@@ -465,7 +479,7 @@ void RemoteDesktopBrowserTest::Cleanup() {
 void RemoteDesktopBrowserTest::SetUpTestForMe2Me() {
   VerifyInternetAccess();
   Install();
-  LaunchChromotingApp();
+  LaunchChromotingApp(false);
   Auth();
   LoadScript(app_web_content(), FILE_PATH_LITERAL("browser_test.js"));
   ExpandMe2Me();