Fix flaky CountingPolicyTest.CapReturns test

chrome/browser/extensions/activity_log/counting_policy_unittest.cc

 // Copyright 2013 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.
 
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
@@ skipping 74 matching lines @@
         day,
         base::Bind(&CountingPolicyTest::CheckWrapper,
                    checker,
                    base::MessageLoop::current()->QuitClosure()));
 
     // Set up a timeout that will trigger after 5 seconds; if we haven't
     // received any results by then assume that the test is broken.
     base::CancelableClosure timeout(
         base::Bind(&CountingPolicyTest::TimeoutCallback));
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, timeout.callback(), base::TimeDelta::FromSeconds(5));

[mvrable, 2013/09/05 18:10:55]

I would update this timeout as well to be consistent.

 
     // Wait for results; either the checker or the timeout callbacks should
     // cause the main loop to exit.
     base::MessageLoop::current()->Run();
 
     timeout.Cancel();
   }
 
   // A helper function to call ReadFilteredData on a policy object and wait for
   // the results to be processed.
@@ skipping 11 matching lines @@
     policy->ReadFilteredData(
         extension_id,
         type,
         api_name,
         page_url,
         arg_url,
         base::Bind(&CountingPolicyTest::CheckWrapper,
                    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(&CountingPolicyTest::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.
     base::MessageLoop::current()->Run();
 
     timeout.Cancel();
   }
 
   // A helper function which verifies that the string_ids and url_ids tables in
   // the database have the specified sizes.
@@ skipping 648 matching lines @@
   CountingPolicy* policy = new CountingPolicy(profile_.get());
 
   for (int i = 0; i < 305; i++) {
     scoped_refptr<Action> action =
         new Action("punky",
                    base::Time::Now(),
                    Action::ACTION_API_CALL,
                    base::StringPrintf("apicall_%d", i));
     policy->ProcessAction(action);
   }
+
   policy->Flush();
+  WaitOnThread(BrowserThread::DB);
 
   CheckReadFilteredData(
       policy,
       "punky",
       Action::ACTION_ANY,
       "",
       "",
       "",
       base::Bind(
           &CountingPolicyTest::RetrieveActions_FetchFilteredActions300));
@@ skipping 111 matching lines @@
 
   CheckReadData(
       policy,
       "punky",
       0,
       base::Bind(&CountingPolicyTest::SomeURLsRemoved));
   policy->Close();
 }
 
 }  // namespace extensions