Adds an automation hook WaitUntilNavigationCompletes() which blocks until pending navigation comple…

chrome/browser/automation/testing_automation_provider.cc

 // Copyright (c) 2012 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/browser/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2143 matching lines @@
   }
 
   // Map json commands to their handlers.
   std::map<std::string, JsonHandler> handler_map;
   handler_map["WaitForAllTabsToStopLoading"] =
       &TestingAutomationProvider::WaitForAllViewsToStopLoading;
   handler_map["GetIndicesFromTab"] =
       &TestingAutomationProvider::GetIndicesFromTab;
   handler_map["NavigateToURL"] =
       &TestingAutomationProvider::NavigateToURL;
+  handler_map["WaitUntilNavigationCompletes"] =
+      &TestingAutomationProvider::WaitUntilNavigationCompletes;
   handler_map["GetLocalStatePrefsInfo"] =
       &TestingAutomationProvider::GetLocalStatePrefsInfo;
   handler_map["SetLocalStatePrefs"] =
       &TestingAutomationProvider::SetLocalStatePrefs;
   handler_map["GetPrefsInfo"] = &TestingAutomationProvider::GetPrefsInfo;
   handler_map["SetPrefs"] = &TestingAutomationProvider::SetPrefs;
   handler_map["ExecuteJavascript"] =
       &TestingAutomationProvider::ExecuteJavascriptJSON;
   handler_map["AddDomEventObserver"] =
       &TestingAutomationProvider::AddDomEventObserver;
@@ skipping 4158 matching lines @@
     return;
   }
   new NavigationNotificationObserver(
       &web_contents->GetController(), this, reply_message,
       navigation_count, false, true);
   browser->OpenURLFromTab(web_contents, OpenURLParams(
       GURL(url), content::Referrer(), CURRENT_TAB,
       content::PAGE_TRANSITION_TYPED, false));
 }
 
+void TestingAutomationProvider::WaitUntilNavigationCompletes(
+    DictionaryValue* args,
+    IPC::Message* reply_message) {
+  if (SendErrorIfModalDialogActive(this, reply_message))
+    return;
+
+  std::string error;
+  Browser* browser;
+  WebContents* web_contents;
+  if (!GetBrowserAndTabFromJSONArgs(args, &browser, &web_contents, &error)) {
+    AutomationJSONReply(this, reply_message).SendError(error);
+    return;
+  }
+  NavigationNotificationObserver* observer =
+      new NavigationNotificationObserver(&web_contents->GetController(), this,
+                                         reply_message, 1, true, true);
+  if (!web_contents->IsLoading()) {
+    AutomationJSONReply(this, reply_message).SendSuccess(NULL);
+    delete observer;
+    return;
+  }
+}
+
 void TestingAutomationProvider::ExecuteJavascriptJSON(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   if (SendErrorIfModalDialogActive(this, reply_message))
     return;
 
   string16 frame_xpath, javascript;
   std::string error;
   RenderViewHost* render_view;
   if (!GetRenderViewFromJSONArgs(args, profile(), &render_view, &error)) {
@@ skipping 626 matching lines @@
       *browser_handle = browser_tracker_->Add(browser);
       *success = true;
     }
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }