Add "Site Settings" option to Clear Browsing Data on Android

chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index afc58b36c45ef0898b925f475d74f75bdb10dc7b..61097fa4994534d51bcc601788261f79b3fb10f3 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -11,8 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
-#include "base/test/test_timeouts.h"
-#include "base/threading/platform_thread.h"
+#include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ -620,11 +619,15 @@ TEST_F(PrefProviderTest, LastModified) {
       ContentSettingsPattern::FromString("www.google.com");
   auto value = base::MakeUnique<base::Value>(CONTENT_SETTING_ALLOW);
 
-  base::Time t1 = base::Time::Now();
-
   // Create a  provider and set a few settings.
   PrefProvider provider(&prefs, false /* incognito */,
                         true /* store_last_modified */);
+  auto* clock = new base::SimpleTestClock();

[Bernhard Bauer, 2017/05/03 16:05:39]

Could you create this in a std::unique_ptr with base::MakeUnique, then get a raw
pointer out of it before passing it into the provider? At this point I'm
conditioned to dislike seeing raw "new" statements ;-) In other places too.

[dullweber, 2017/05/03 16:23:00]

Done.

+  clock->SetNow(base::Time::Now());
+  provider.SetClockForTesting(base::WrapUnique(clock));
+
+  base::Time t1 = clock->Now();
+
   provider.SetWebsiteSetting(pattern_1, ContentSettingsPattern::Wildcard(),
                              CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
                              value->DeepCopy());
@@ -632,19 +635,17 @@ TEST_F(PrefProviderTest, LastModified) {
                              CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
                              value->DeepCopy());
   // Make sure that the timestamps for pattern_1 and patter_2 are before |t2|.
-  base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
-  base::Time t2 = base::Time::Now();
+  clock->Advance(base::TimeDelta::FromSeconds(1));
+  base::Time t2 = clock->Now();
 
   base::Time last_modified = provider.GetWebsiteSettingLastModified(
       pattern_1, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES, std::string());
-  EXPECT_GE(last_modified, t1);
-  EXPECT_LT(last_modified, t2);
+  EXPECT_EQ(last_modified, t1);
   last_modified = provider.GetWebsiteSettingLastModified(
       pattern_2, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES, std::string());
-  EXPECT_GE(last_modified, t1);
-  EXPECT_LT(last_modified, t2);
+  EXPECT_EQ(last_modified, t1);
 
   // A change for pattern_1, which will update the last_modified timestamp.
   auto value2 = base::MakeUnique<base::Value>(CONTENT_SETTING_BLOCK);
@@ -655,14 +656,13 @@ TEST_F(PrefProviderTest, LastModified) {
   last_modified = provider.GetWebsiteSettingLastModified(
       pattern_1, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES, std::string());
-  EXPECT_GE(last_modified, t2);
+  EXPECT_EQ(last_modified, t2);
 
   // The timestamp of pattern_2 shouldn't change.
   last_modified = provider.GetWebsiteSettingLastModified(
       pattern_2, ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES, std::string());
-  EXPECT_GE(last_modified, t1);
-  EXPECT_LT(last_modified, t2);
+  EXPECT_EQ(last_modified, t1);
 
   provider.ShutdownOnUIThread();
 }