Index: chrome/browser/extensions/activity_log/activity_log_browsertest.cc |
diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc |
index 43664e4d6d39a44b0715c407e44148e084777d9e..b1f0387f7c10874e594b3a3550621f13d2ea7fe3 100644 |
--- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc |
+++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc |
@@ -4,11 +4,11 @@ |
#include <stdint.h> |
+#include "base/callback.h" |
#include "base/location.h" |
#include "base/run_loop.h" |
#include "base/single_thread_task_runner.h" |
#include "base/strings/stringprintf.h" |
-#include "base/threading/thread_task_runner_handle.h" |
#include "chrome/browser/extensions/activity_log/activity_log.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
#include "chrome/browser/extensions/extension_browsertest.h" |
@@ -42,10 +42,9 @@ class ActivityLogPrerenderTest : public ExtensionApiTest { |
static void Prerender_Arguments( |
const std::string& extension_id, |
uint16_t port, |
+ const base::Closure& quit_when_idle_closure, |
std::unique_ptr<std::vector<scoped_refptr<Action>>> i) { |
- // This is to exit RunLoop (base::MessageLoop::current()->Run()) below |
- base::ThreadTaskRunnerHandle::Get()->PostTask( |
- FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
+ quit_when_idle_closure.Run(); |
ASSERT_TRUE(i->size()); |
scoped_refptr<Action> last = i->front(); |
@@ -112,18 +111,14 @@ IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) { |
page_observer.Wait(); |
+ base::RunLoop run_loop; |
activity_log->GetFilteredActions( |
- ext->id(), |
- Action::ACTION_ANY, |
- "", |
- "", |
- "", |
- -1, |
- base::Bind( |
- ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port)); |
+ ext->id(), Action::ACTION_ANY, "", "", "", -1, |
+ base::Bind(ActivityLogPrerenderTest::Prerender_Arguments, ext->id(), port, |
+ run_loop.QuitWhenIdleClosure())); |
// Allow invocation of Prerender_Arguments |
- base::RunLoop().Run(); |
+ run_loop.Run(); |
} |
} // namespace extensions |