Fix flaky CountingPolicyTest.CapReturns test

chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc

Index: chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index 56e5146b6e37ea060a9556edf8c631bbc5da530f..bd0286d1e1005735f95962d2c3668efe3caa4f2a 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -83,7 +83,7 @@ class FullStreamUIPolicyTest : public testing::Test {
     base::CancelableClosure timeout(
         base::Bind(&FullStreamUIPolicyTest::TimeoutCallback));
     base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(5));
+        FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(8));
 
     // Wait for results; either the checker or the timeout callbacks should
     // cause the main loop to exit.
@@ -115,12 +115,12 @@ class FullStreamUIPolicyTest : public testing::Test {
                    checker,
                    base::MessageLoop::current()->QuitClosure()));
 
-    // Set up a timeout that will trigger after 5 seconds; if we haven't
+    // Set up a timeout that will trigger after 8 seconds; if we haven't
     // received any results by then assume that the test is broken.
     base::CancelableClosure timeout(
         base::Bind(&FullStreamUIPolicyTest::TimeoutCallback));
     base::MessageLoop::current()->PostDelayedTask(
-        FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(5));
+        FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(8));
 
     // Wait for results; either the checker or the timeout callbacks should
     // cause the main loop to exit.
@@ -659,7 +659,14 @@ TEST_F(FullStreamUIPolicyTest, CapReturns) {
                    base::StringPrintf("apicall_%d", i));
     policy->ProcessAction(action);
   }
+
   policy->Flush();
+  BrowserThread::PostTaskAndReply(
+      thread,
+      FROM_HERE,
+      base::Bind(&base::DoNothing),
+      base::MessageLoop::current()->QuitClosure());
+  base::MessageLoop::current()->Run();

[Matt Perry, 2013/09/05 18:49:19]

nit: use RunLoop instead. see
https://code.google.com/p/chromium/codesearch#chromium/src/base/run_loop.h&q=...

 
   CheckReadFilteredData(
       policy,