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

content/public/test/test_utils.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_TEST_UTILS_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 241 matching lines @@
  public:
   InProcessUtilityThreadHelper();
   ~InProcessUtilityThreadHelper() override;
 
  private:
   void BrowserChildProcessHostConnected(const ChildProcessData& data) override;
   void BrowserChildProcessHostDisconnected(
       const ChildProcessData& data) override;
 
   int child_thread_count_;
-  scoped_refptr<MessageLoopRunner> runner_;
+  std::unique_ptr<base::RunLoop> run_loop_;
   std::unique_ptr<TestServiceManagerContext> shell_context_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessUtilityThreadHelper);
 };
 
 // This observer keeps track of the last deleted RenderFrame to avoid
 // accessing it and causing use-after-free condition.
 class RenderFrameDeletedObserver : public WebContentsObserver {
  public:
   RenderFrameDeletedObserver(RenderFrameHost* rfh);
@@ skipping 20 matching lines @@
   explicit WebContentsDestroyedWatcher(WebContents* web_contents);
   ~WebContentsDestroyedWatcher() override;
 
   // Waits until the WebContents is destroyed.
   void Wait();
 
  private:
   // Overridden WebContentsObserver methods.
   void WebContentsDestroyed() override;
 
-  scoped_refptr<MessageLoopRunner> message_loop_runner_;
+  base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsDestroyedWatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_UTILS_H_