Revert of Convert more test helpers to base::RunLoop, fix page title checks.

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 <stddef.h>
 #include <tuple>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/process/kill.h"
 #include "base/rand_util.h"
-#include "base/stl_util.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "cc/surfaces/surface.h"
@@ skipping 1156 matching lines @@
 
   while (!ContainsSurfaceId(root_surface_id, child_view)) {
     base::RunLoop run_loop;
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, run_loop.QuitClosure(), TestTimeouts::tiny_timeout());
     run_loop.Run();
   }
 }
 #endif
 
-TitleWatcher::TitleWatcher(WebContents* web_contents)
-    : WebContentsObserver(web_contents) {
-  EXPECT_TRUE(web_contents != nullptr);
-}
-
 TitleWatcher::TitleWatcher(WebContents* web_contents,
                            const base::string16& expected_title)
-    : TitleWatcher(web_contents) {
+    : 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);
 }
 
 TitleWatcher::~TitleWatcher() {
 }
 
 const base::string16& TitleWatcher::WaitAndGetTitle() {
   TestTitle();
-  run_loop_.Run();
+  message_loop_runner_->Run();
   return observed_title_;
 }
 
 void TitleWatcher::DidStopLoading() {
   // When navigating through the history, the restored NavigationEntry's title
   // will be used. If the entry ends up having the same title after we return
   // to it, as will usually be the case, then WebContentsObserver::TitleSet
   // will then be suppressed, since the NavigationEntry's title hasn't changed.
   TestTitle();
 }
 
 void TitleWatcher::TitleWasSet(NavigationEntry* entry, bool explicit_set) {
   TestTitle();
 }
 
 void TitleWatcher::TestTitle() {
-  const base::string16& current_title = web_contents()->GetTitle();
-  if ((!current_title.empty() && expected_titles_.empty()) ||
-      base::ContainsValue(expected_titles_, current_title)) {
-    observed_title_ = current_title;
-    run_loop_.Quit();
-  }
+  std::vector<base::string16>::const_iterator it =
+      std::find(expected_titles_.begin(),
+                expected_titles_.end(),
+                web_contents()->GetTitle());
+  if (it == expected_titles_.end())
+    return;
+
+  observed_title_ = *it;
+  message_loop_runner_->Quit();
 }
 
 RenderProcessHostWatcher::RenderProcessHostWatcher(
     RenderProcessHost* render_process_host, WatchType type)
     : render_process_host_(render_process_host),
       type_(type),
       did_exit_normally_(true),
       message_loop_runner_(new MessageLoopRunner) {
   render_process_host_->AddObserver(this);
 }
@@ skipping 592 matching lines @@
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       process->GetChannel(),
       FileSystemHostMsg_Write(request_id, file_path, blob_uuid, position));
 
   // If this started an async operation, wait for it to complete.
   if (waiter.did_start_update())
     waiter.WaitForEndUpdate();
 }
 
 }  // namespace content