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

content/public/test/browser_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_BROWSER_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
+#include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "cc/output/compositor_frame.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/page_type.h"
@@ skipping 311 matching lines @@
                                   gfx::Point point);
 //
 // Waits until the cc::Surface associated with a guest/cross-process-iframe
 // has been drawn for the first time. Once this method returns it should be
 // safe to assume that events sent to the top-level RenderWidgetHostView can
 // be expected to properly hit-test to this surface, if appropriate.
 void WaitForGuestSurfaceReady(content::WebContents* web_contents);
 
 #endif
 
-// Watches title changes on a WebContents, blocking until an expected title is
-// set.
+// Watches title changes on a WebContents, blocking until a title is set.
+// Can wait unitl a specific expected title appears.
 class TitleWatcher : public WebContentsObserver {
  public:
   // |web_contents| must be non-NULL and needs to stay alive for the
+  // entire lifetime of |this|. Will wait for any (non-empty) title unless
+  // |AlsoWaitForTitle| is called before waiting.
+  explicit TitleWatcher(WebContents* web_contents);
+
+  // |web_contents| must be non-NULL and needs to stay alive for the
   // entire lifetime of |this|. |expected_title| is the title that |this|
   // will wait for.
   TitleWatcher(WebContents* web_contents,
                const base::string16& expected_title);
   ~TitleWatcher() override;
 
   // Adds another title to watch for.
   void AlsoWaitForTitle(const base::string16& expected_title);
 
   // Waits until the title matches either expected_title or one of the titles
   // added with AlsoWaitForTitle. Returns the value of the most recently
   // observed matching title.
   const base::string16& WaitAndGetTitle() WARN_UNUSED_RESULT;
 
  private:
   // Overridden WebContentsObserver methods.
   void DidStopLoading() override;
   void TitleWasSet(NavigationEntry* entry, bool explicit_set) override;
 
   void TestTitle();
 
   std::vector<base::string16> expected_titles_;
-  scoped_refptr<MessageLoopRunner> message_loop_runner_;
+  base::RunLoop run_loop_;
 
   // The most recently observed expected title, if any.
   base::string16 observed_title_;
 
   DISALLOW_COPY_AND_ASSIGN(TitleWatcher);
 };
 
 // Watches a RenderProcessHost and waits for specified destruction events.
 class RenderProcessHostWatcher : public RenderProcessHostObserver {
  public:
@@ skipping 368 matching lines @@
 
  private:
   PwnMessageHelper();  // Not instantiable.
 
   DISALLOW_COPY_AND_ASSIGN(PwnMessageHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_