Add origin-based deletion to BrowsingDataRemover

chrome/browser/browsing_data_remover_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/browsing_data_remover.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 34 matching lines @@
 const GURL kOrigin1(kTestkOrigin1);
 const GURL kOrigin2(kTestkOrigin2);
 const GURL kOrigin3(kTestkOrigin3);
 
 const quota::StorageType kTemporary = quota::kStorageTypeTemporary;
 const quota::StorageType kPersistent = quota::kStorageTypePersistent;
 
 const quota::QuotaClient::ID kClientFile = quota::QuotaClient::kFileSystem;
 const quota::QuotaClient::ID kClientDB = quota::QuotaClient::kIndexedDatabase;
 
+} // Namespace

[Bernhard Bauer, 2012/02/16 17:23:30]

Nit: two spaces before //, and namespace in lowercase.

+
 class BrowsingDataRemoverTester : public BrowsingDataRemover::Observer {
  public:
   BrowsingDataRemoverTester()
       : start_(false),
         already_quit_(false) {}
   virtual ~BrowsingDataRemoverTester() {}
 
   void BlockUntilNotified() {
     if (!already_quit_) {
       DCHECK(!start_);
@@ skipping 252 matching lines @@
         base::Time::Now() + base::TimeDelta::FromMilliseconds(10));
     remover->AddObserver(tester);
 
     called_with_details_.reset(new BrowsingDataRemover::NotificationDetails());
 
     // BrowsingDataRemover deletes itself when it completes.
     remover->Remove(remove_mask);
     tester->BlockUntilNotified();
   }
 
+  void BlockUntilOriginDataRemoved(BrowsingDataRemover::TimePeriod period,
+                                   int remove_mask,
+                                   const GURL& remove_origin,
+                                   BrowsingDataRemoverTester* tester) {
+    BrowsingDataRemover* remover = new BrowsingDataRemover(
+        profile_.get(), period,
+        base::Time::Now() + base::TimeDelta::FromMilliseconds(10));
+    remover->AddObserver(tester);
+
+    called_with_details_.reset(new BrowsingDataRemover::NotificationDetails());
+
+    // BrowsingDataRemover deletes itself when it completes.
+    remover->RemoveImpl(remove_mask, remove_origin, false);
+    tester->BlockUntilNotified();
+  }
+
   TestingProfile* GetProfile() {
     return profile_.get();
   }
 
   base::Time GetBeginTime() {
     return called_with_details_->removal_begin;
   }
 
   int GetRemovalMask() {
     return called_with_details_->removal_mask;
@@ skipping 325 matching lines @@
   EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kTemporary,
       kClientFile));
   EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin1, kPersistent,
       kClientFile));
   EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin2, kPersistent,
       kClientFile));
   EXPECT_FALSE(GetMockManager()->OriginHasData(kOrigin3, kPersistent,
       kClientFile));
 }
 
-}  // namespace
+TEST_F(BrowsingDataRemoverTest, OriginBasedHistoryRemoval) {
+  scoped_ptr<RemoveHistoryTester> tester(
+      new RemoveHistoryTester(GetProfile()));
+
+  base::Time two_hours_ago = base::Time::Now() - base::TimeDelta::FromHours(2);
+
+  tester->AddHistory(kOrigin1, base::Time::Now());
+  tester->AddHistory(kOrigin2, two_hours_ago);
+  ASSERT_TRUE(tester->HistoryContainsURL(kOrigin1));
+  ASSERT_TRUE(tester->HistoryContainsURL(kOrigin2));
+
+  BlockUntilOriginDataRemoved(BrowsingDataRemover::EVERYTHING,
+      BrowsingDataRemover::REMOVE_HISTORY, kOrigin2, tester.get());
+
+  EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+  EXPECT_TRUE(tester->HistoryContainsURL(kOrigin1));
+  EXPECT_FALSE(tester->HistoryContainsURL(kOrigin2));
+}
+
+TEST_F(BrowsingDataRemoverTest, OriginAndTimeBasedHistoryRemoval) {
+  scoped_ptr<RemoveHistoryTester> tester(
+      new RemoveHistoryTester(GetProfile()));
+
+  base::Time two_hours_ago = base::Time::Now() - base::TimeDelta::FromHours(2);
+
+  tester->AddHistory(kOrigin1, base::Time::Now());
+  tester->AddHistory(kOrigin2, two_hours_ago);
+  ASSERT_TRUE(tester->HistoryContainsURL(kOrigin1));
+  ASSERT_TRUE(tester->HistoryContainsURL(kOrigin2));
+
+  BlockUntilOriginDataRemoved(BrowsingDataRemover::LAST_HOUR,
+      BrowsingDataRemover::REMOVE_HISTORY, kOrigin2, tester.get());
+
+  EXPECT_EQ(BrowsingDataRemover::REMOVE_HISTORY, GetRemovalMask());
+  EXPECT_TRUE(tester->HistoryContainsURL(kOrigin1));
+  EXPECT_TRUE(tester->HistoryContainsURL(kOrigin2));
+}