[chromedriver] Remove unnecessary round trips to Chrome.

chrome/test/chromedriver/window_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/window_commands.h"
 
 #include <list>
 
 #include "base/callback.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/basic_types.h"
 #include "chrome/test/chromedriver/chrome/chrome.h"
+#include "chrome/test/chromedriver/chrome/devtools_client.h"
 #include "chrome/test/chromedriver/chrome/geoposition.h"
+#include "chrome/test/chromedriver/chrome/javascript_dialog_manager.h"
 #include "chrome/test/chromedriver/chrome/js.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/chrome/ui_events.h"
 #include "chrome/test/chromedriver/chrome/web_view.h"
 #include "chrome/test/chromedriver/element_util.h"
 #include "chrome/test/chromedriver/session.h"
 #include "chrome/test/chromedriver/util.h"
 
 namespace {
 
@@ skipping 91 matching lines @@
   return Status(kOk);
 }
 
 }  // namespace
 
 Status ExecuteWindowCommand(
     const WindowCommand& command,
     Session* session,
     const base::DictionaryValue& params,
     scoped_ptr<base::Value>* value) {
-  bool is_dialog_open;
-  Status status = session->chrome->IsJavaScriptDialogOpen(&is_dialog_open);
-  if (status.IsError())
-    return status;
-  if (is_dialog_open)
-    return Status(kUnexpectedAlertOpen);
-
   WebView* web_view = NULL;
-  status = session->GetTargetWindow(&web_view);
+  Status status = session->GetTargetWindow(&web_view);
   if (status.IsError())
     return status;
 
   status = web_view->ConnectIfNecessary();
   if (status.IsError())
     return status;
 
+  status = web_view->GetDevToolsClient()->HandleReceivedEvents();
+  if (status.IsError())
+    return status;
+
+  if (web_view->GetJavaScriptDialogManager()->IsDialogOpen())
+    return Status(kUnexpectedAlertOpen);
+
   Status nav_status =
       web_view->WaitForPendingNavigations(session->GetCurrentFrameId());
   if (nav_status.IsError())
     return nav_status;
   status = command.Run(session, web_view, params, value);
   // Switch to main frame and retry command if subframe no longer exists.
   if (status.code() == kNoSuchExecutionContext) {
     session->SwitchToTopFrame();
     nav_status =
         web_view->WaitForPendingNavigations(session->GetCurrentFrameId());
@@ skipping 591 matching lines @@
     // |accuracy| is not part of the WebDriver spec yet, so if it is not given
     // default to 100 meters accuracy.
     geoposition.accuracy = 100;
   }
 
   Status status = web_view->OverrideGeolocation(geoposition);
   if (status.IsOk())
     session->overridden_geoposition.reset(new Geoposition(geoposition));
   return status;
 }