Add WaitForInterstitialReady to browser_test_utils.

content/public/test/browser_test_utils.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 "content/public/test/browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/process/kill.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/values.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/dom_operation_notification_details.h"
 #include "content/public/browser/histogram_fetcher.h"
+#include "content/public/browser/interstitial_page.h"

[mattm, 2015/01/22 04:51:27]

no longer needed

[meacer, 2015/01/22 18:31:37]

Done.

 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/filename_util.h"
@@ skipping 682 matching lines @@
       new content::MessageLoopRunner);
   InterstitialObserver observer(web_contents,
                                 base::Closure(),
                                 loop_runner->QuitClosure());
   if (!task.is_null())
     task.Run();
   // At this point, web_contents may have been deleted.
   loop_runner->Run();
 }
 
+bool WaitForRenderFrameReady(RenderFrameHost* rfh) {
+  if (!rfh)
+    return false;
+  std::string result;
+  EXPECT_TRUE(
+      content::ExecuteScriptAndExtractString(
+          rfh,
+          "(function() {"
+          "  var done = false;"
+          "  function checkState() {"
+          "    if (!done && document.readyState == 'complete') {"
+          "      done = true;"
+          "      window.domAutomationController.send('pageLoadComplete');"
+          "    }"
+          "  }"
+          "  checkState();"
+          "  document.addEventListener('readystatechange', checkState);"

[Paweł Hajdan Jr., 2015/01/22 15:43:10]

I might be wrong (not a JS/DOM expert), but shouldn't we add the event listener
first? I wonder if there might be a race if the condition becomes true right
between checkState() and addEventListener() calls.

[mmenke, 2015/01/22 15:53:25]

Javascript and the DOM are essentially single-threaded.  The DOM can't change
and an event can't happen in the middle of the execution of Javascript running.

That having been said, I'm certainly fine with changing order, it just doesn't
matter, either way, in this case.

[mmenke, 2015/01/22 15:55:00]

That is, they can't change except as a result of a Javascript function call, of
course.

+          "})();",
+          &result));
+  return result == "pageLoadComplete";
+}
+
 TitleWatcher::TitleWatcher(WebContents* web_contents,
                            const base::string16& expected_title)
     : WebContentsObserver(web_contents),
       message_loop_runner_(new MessageLoopRunner) {
   EXPECT_TRUE(web_contents != NULL);
   expected_titles_.push_back(expected_title);
 }
 
 void TitleWatcher::AlsoWaitForTitle(const base::string16& expected_title) {
   expected_titles_.push_back(expected_title);
@@ skipping 181 matching lines @@
 
 bool WebContentsAddedObserver::RenderViewCreatedCalled() {
   if (child_observer_) {
     return child_observer_->render_view_created_called_ &&
            child_observer_->main_frame_created_called_;
   }
   return false;
 }
 
 }  // namespace content