Enable ConditionalCacheDeletionHelperBrowserTest.TimeAndURL again

content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc

 // Copyright (c) 2015 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 <algorithm>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "content/browser/browsing_data/conditional_cache_deletion_helper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/cache_test_util.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/shell/browser/shell.h"
 #include "net/disk_cache/disk_cache.h"
@@ skipping 88 matching lines @@
   // Expect that the keys with values 56 and 42 were deleted.
   keys.erase("56");
   keys.erase("42");
   CompareRemainingKeys(keys);
 }
 
 // Tests that ConditionalCacheDeletionHelper correctly constructs a condition
 // for time and URL.
 //
 // Note: This test depends on the timing in cache backends and can be flaky
-// if those backends are slow. If this turns out to be a problem, consider
-// increasing the |timeout_ms| constant.
+// if those backends are slow.
 //
 // Flakily timing out on Mac 10.11 (crbug.com/646119) and flakily
-// failing on Linux/ChromeOS (crbug.com/624836).
-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS)
+// failing on Linux/ChromeOS (crbug.com/624836)
+// --> Switched to tiny_timeout and enabled the test on all platforms to check
+//     if it will be more stable now.
+#if false
 #define MAYBE_TimeAndURL DISABLED_TimeAndURL
 #else
 #define MAYBE_TimeAndURL TimeAndURL
 #endif
 IN_PROC_BROWSER_TEST_F(ConditionalCacheDeletionHelperBrowserTest,
                        MAYBE_TimeAndURL) {
-  const int64_t timeout_ms = 1;
 
   // Create some entries.
   std::set<std::string> keys;
   keys.insert("https://google.com/index.html");
   keys.insert("https://example.com/foo/bar/icon.png");
   keys.insert("http://chrome.com");
 
   GetCacheTestUtil()->CreateCacheEntries(keys);
 
-  // Wait |timeout_ms| milliseconds for the cache to write the entries.
+  // Wait some milliseconds for the cache to write the entries.
   // This assures that future entries will have timestamps strictly greater than
   // the ones we just added.
-  base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(timeout_ms));
+  base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
   base::Time now = base::Time::Now();
 
   // Create a few more entries with a later timestamp.
   std::set<std::string> newer_keys;
   newer_keys.insert("https://google.com/");
   newer_keys.insert("https://example.com/foo/bar/icon2.png");
   newer_keys.insert("https://example.com/foo/bar/icon3.png");
   newer_keys.insert("http://example.com/foo/bar/icon4.png");
 
   GetCacheTestUtil()->CreateCacheEntries(newer_keys);
@@ skipping 12 matching lines @@
   WaitForTasksOnIOThread();
 
   // Expect that only "icon2.png" and "icon3.png" were deleted.
   keys.insert(newer_keys.begin(), newer_keys.end());
   keys.erase("https://example.com/foo/bar/icon2.png");
   keys.erase("https://example.com/foo/bar/icon3.png");
   CompareRemainingKeys(keys);
 }
 
 }  // namespace content