| Index: content/public/test/browser_test_utils.h
|
| diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h
|
| index 7434184877101e15358ca46e9fd40a11be94532b..e39416c789bd79e3bded26d7690201a40d3915a4 100644
|
| --- a/content/public/test/browser_test_utils.h
|
| +++ b/content/public/test/browser_test_utils.h
|
| @@ -15,7 +15,6 @@
|
| #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"
|
| @@ -347,15 +346,10 @@
|
|
|
| #endif
|
|
|
| -// Watches title changes on a WebContents, blocking until a title is set.
|
| -// Can wait unitl a specific expected title appears.
|
| +// Watches title changes on a WebContents, blocking until an expected title is
|
| +// set.
|
| 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.
|
| @@ -379,7 +373,7 @@
|
| void TestTitle();
|
|
|
| std::vector<base::string16> expected_titles_;
|
| - base::RunLoop run_loop_;
|
| + scoped_refptr<MessageLoopRunner> message_loop_runner_;
|
|
|
| // The most recently observed expected title, if any.
|
| base::string16 observed_title_;
|
|
|