[chromedriver] When launching a Chrome App, automatically switch to the new window.

chrome/test/chromedriver/session_commands.cc

 // Copyright (c) 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.
 
 #include "chrome/test/chromedriver/session_commands.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 177 matching lines @@
   }
 
   session->window = web_view_ids.front();
   session->detach = capabilities.detach;
   session->force_devtools_screenshot = capabilities.force_devtools_screenshot;
   session->capabilities = CreateCapabilities(session->chrome.get());
   value->reset(session->capabilities->DeepCopy());
   return CheckSessionCreated(session);
 }
 
+Status SwitchToWebView(Session* session, const std::string& web_view_id) {
+  if (session->overridden_geoposition) {
+    WebView* web_view;
+    Status status = session->chrome->GetWebViewById(web_view_id, &web_view);
+    if (status.IsError())
+      return status;
+    status = web_view->ConnectIfNecessary();
+    if (status.IsError())
+      return status;
+    status = web_view->OverrideGeolocation(*session->overridden_geoposition);
+    if (status.IsError())
+      return status;
+  }
+
+  if (session->overridden_network_conditions) {
+    WebView* web_view;
+    Status status = session->chrome->GetWebViewById(web_view_id, &web_view);
+    if (status.IsError())
+      return status;
+    status = web_view->ConnectIfNecessary();
+    if (status.IsError())
+      return status;
+    status = web_view->OverrideNetworkConditions(
+        *session->overridden_network_conditions);
+    if (status.IsError())
+      return status;
+  }
+
+  session->window = web_view_id;
+  session->SwitchToTopFrame();
+  session->mouse_position = WebPoint(0, 0);
+  return Status(kOk);
+}
+
 }  // namespace
 
 Status ExecuteInitSession(
     const InitSessionParams& bound_params,
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   Status status = InitSessionHelper(bound_params, session, params, value);
   if (status.IsError()) {
     session->quit = true;
@@ skipping 48 matching lines @@
   ChromeDesktopImpl* desktop = NULL;
   Status status = session->chrome->GetAsDesktop(&desktop);
   if (status.IsError())
     return status;
 
   AutomationExtension* extension = NULL;
   status = desktop->GetAutomationExtension(&extension);
   if (status.IsError())
     return status;
 
-  return extension->LaunchApp(id);
+  status = extension->LaunchApp(id);
+  if (status.IsError())
+    return status;
+
+  std::string web_view_id;
+  base::TimeDelta timeout = base::TimeDelta::FromSeconds(60);
+  status = desktop->WaitForNewAppWindow(timeout, id, &web_view_id);
+  if (status.IsError())
+    return status;
+
+  return SwitchToWebView(session, web_view_id);
 }
 
 Status ExecuteClose(
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   std::list<std::string> web_view_ids;
   Status status = session->chrome->GetWebViewIds(&web_view_ids);
   if (status.IsError())
     return status;
@@ skipping 85 matching lines @@
       if (window_name == name) {
         web_view_id = *it;
         found = true;
         break;
       }
     }
   }
 
   if (!found)
     return Status(kNoSuchWindow);
-
-  if (session->overridden_geoposition) {
-    WebView* web_view;
-    status = session->chrome->GetWebViewById(web_view_id, &web_view);
-    if (status.IsError())
-      return status;
-    status = web_view->ConnectIfNecessary();
-    if (status.IsError())
-      return status;
-    status = web_view->OverrideGeolocation(*session->overridden_geoposition);
-    if (status.IsError())
-      return status;
-  }
-
-  if (session->overridden_network_conditions) {
-    WebView* web_view;
-    status = session->chrome->GetWebViewById(web_view_id, &web_view);
-    if (status.IsError())
-      return status;
-    status = web_view->ConnectIfNecessary();
-    if (status.IsError())
-      return status;
-    status = web_view->OverrideNetworkConditions(
-        *session->overridden_network_conditions);
-    if (status.IsError())
-      return status;
-  }
-
-  session->window = web_view_id;
-  session->SwitchToTopFrame();
-  session->mouse_position = WebPoint(0, 0);
-  return Status(kOk);
+  return SwitchToWebView(session, web_view_id);
 }
 
 Status ExecuteSetTimeout(
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   double ms_double;
   if (!params.GetDouble("ms", &ms_double))
     return Status(kUnknownError, "'ms' must be a double");
   std::string type;
@@ skipping 298 matching lines @@
 Status ExecuteSetAutoReporting(
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
   bool enabled;
   if (!params.GetBoolean("enabled", &enabled))
     return Status(kUnknownError, "missing parameter 'enabled'");
   session->auto_reporting_enabled = enabled;
   return Status(kOk);
 }