Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
index 619588e2045ea5e62af97ae4a63506aa0ef2f926..1432a89fc5e5cb56da69a0edd6c99379e0cde450 100644 |
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
@@ -43,6 +43,8 @@ |
#include "components/autofill/core/browser/credit_card.h" |
#include "components/autofill/core/browser/personal_data_manager.h" |
#include "components/autofill/core/browser/personal_data_manager_observer.h" |
+#include "components/domain_reliability/clear_mode.h" |
+#include "components/domain_reliability/monitor.h" |
#include "content/public/browser/cookie_store_factory.h" |
#include "content/public/browser/dom_storage_context.h" |
#include "content/public/browser/local_storage_usage_info.h" |
@@ -62,6 +64,10 @@ |
using content::BrowserThread; |
using content::StoragePartition; |
+using domain_reliability::CLEAR_BEACONS; |
+using domain_reliability::CLEAR_CONTEXTS; |
+using domain_reliability::DomainReliabilityClearMode; |
+using domain_reliability::DomainReliabilityMonitor; |
using testing::_; |
using testing::Invoke; |
using testing::WithArgs; |
@@ -574,6 +580,28 @@ class RemoveLocalStorageTester { |
DISALLOW_COPY_AND_ASSIGN(RemoveLocalStorageTester); |
}; |
+class TestingProfileWithDomainReliabilityMonitor : public TestingProfile { |
+ public: |
+ TestingProfileWithDomainReliabilityMonitor() : |
+ TestingProfile(), |
+ upload_reporter_string_("test-reporter"), |
+ monitor_(GetRequestContext()->GetURLRequestContext(), |
+ upload_reporter_string_) {} |
+ |
+ virtual void ClearDomainReliabilityMonitor( |
+ DomainReliabilityClearMode mode, |
+ const base::Closure& completion) OVERRIDE { |
+ monitor_.ClearBrowsingData(mode); |
+ completion.Run(); |
+ } |
+ |
+ DomainReliabilityMonitor* monitor() { return &monitor_; } |
+ |
+ private: |
+ std::string upload_reporter_string_; |
+ DomainReliabilityMonitor monitor_; |
+}; |
+ |
// Test Class ---------------------------------------------------------------- |
class BrowsingDataRemoverTest : public testing::Test, |
@@ -679,6 +707,14 @@ class BrowsingDataRemoverTest : public testing::Test, |
registrar_.RemoveAll(); |
} |
+ DomainReliabilityMonitor *UseProfileWithDomainReliabilityMonitor() { |
+ TestingProfileWithDomainReliabilityMonitor* new_profile = |
+ new TestingProfileWithDomainReliabilityMonitor(); |
+ DomainReliabilityMonitor* monitor = new_profile->monitor(); |
+ profile_.reset(new_profile); |
+ return monitor; |
+ } |
+ |
protected: |
scoped_ptr<BrowsingDataRemover::NotificationDetails> called_with_details_; |
@@ -1618,3 +1654,44 @@ TEST_F(BrowsingDataRemoverTest, ContentProtectionPlatformKeysRemoval) { |
chromeos::DBusThreadManager::Shutdown(); |
} |
#endif |
+ |
+TEST_F(BrowsingDataRemoverTest, DomainReliability_Null) { |
+ DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor(); |
+ EXPECT_FALSE(monitor->was_cleared_for_testing()); |
+} |
+ |
+TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons) { |
+ DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor(); |
+ BlockUntilBrowsingDataRemoved( |
+ BrowsingDataRemover::EVERYTHING, |
+ BrowsingDataRemover::REMOVE_HISTORY, false); |
+ EXPECT_TRUE(monitor->was_cleared_for_testing()); |
+ EXPECT_EQ(CLEAR_BEACONS, monitor->cleared_mode_for_testing()); |
+} |
+ |
+TEST_F(BrowsingDataRemoverTest, DomainReliability_Beacons_ProtectedOrigins) { |
+ DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor(); |
+ BlockUntilBrowsingDataRemoved( |
+ BrowsingDataRemover::EVERYTHING, |
+ BrowsingDataRemover::REMOVE_HISTORY, true); |
+ EXPECT_TRUE(monitor->was_cleared_for_testing()); |
+ EXPECT_EQ(CLEAR_BEACONS, monitor->cleared_mode_for_testing()); |
+} |
+ |
+TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts) { |
+ DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor(); |
+ BlockUntilBrowsingDataRemoved( |
+ BrowsingDataRemover::EVERYTHING, |
+ BrowsingDataRemover::REMOVE_COOKIES, false); |
+ EXPECT_TRUE(monitor->was_cleared_for_testing()); |
+ EXPECT_EQ(CLEAR_CONTEXTS, monitor->cleared_mode_for_testing()); |
+} |
+ |
+TEST_F(BrowsingDataRemoverTest, DomainReliability_Contexts_ProtectedOrigins) { |
+ DomainReliabilityMonitor* monitor = UseProfileWithDomainReliabilityMonitor(); |
+ BlockUntilBrowsingDataRemoved( |
+ BrowsingDataRemover::EVERYTHING, |
+ BrowsingDataRemover::REMOVE_COOKIES, true); |
+ EXPECT_TRUE(monitor->was_cleared_for_testing()); |
+ EXPECT_EQ(CLEAR_CONTEXTS, monitor->cleared_mode_for_testing()); |
+} |