Add origin-based deletion to BrowsingDataRemover

chrome/browser/search_engines/template_url_service_unittest.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 456 matching lines @@
             TemplateURLService::GenerateKeyword(GURL("https://blah"), true));
   ASSERT_EQ(ASCIIToUTF16("foo"),
             TemplateURLService::GenerateKeyword(GURL("http://foo"), true));
   // www. should be stripped.
   ASSERT_EQ(ASCIIToUTF16("foo"),
             TemplateURLService::GenerateKeyword(GURL("http://www.foo"), true));
   // Shouldn't generate keywords with paths, if autodetected.
   ASSERT_EQ(string16(),
             TemplateURLService::GenerateKeyword(GURL("http://blah/foo"), true));
   ASSERT_EQ(ASCIIToUTF16("blah"),
             TemplateURLService::GenerateKeyword(GURL("http://blah/foo"), false));

[Peter Kasting, 2012/02/16 18:16:35]

Nit: While here, this line is >80 cols

[Use mkwst_at_chromium.org plz., 2012/02/17 10:12:36]

Done.

   // FTP shouldn't generate a keyword.
   ASSERT_EQ(string16(),
             TemplateURLService::GenerateKeyword(GURL("ftp://blah/"), true));
   // Make sure we don't get a trailing /
   ASSERT_EQ(ASCIIToUTF16("blah"),
             TemplateURLService::GenerateKeyword(GURL("http://blah/"), true));
 }
 
 TEST_F(TemplateURLServiceTest, GenerateSearchURL) {
   scoped_refptr<TestGenerateSearchURL> test_generate_search_url(
@@ skipping 10 matching lines @@
       new TestGenerateSearchURL(&search_terms_data));
 
   test_util_.StartIOThread();
   BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)->PostTask(
           FROM_HERE, base::Bind(&TestGenerateSearchURL::RunTest,
                                 test_generate_search_url.get()));
   TemplateURLServiceTestUtil::BlockTillIOThreadProcessesRequests();
   EXPECT_TRUE(test_generate_search_url->passed());
 }
 
 TEST_F(TemplateURLServiceTest, ClearBrowsingData_Keywords) {

[Peter Kasting, 2012/02/16 18:16:35]

While here, can you also add a test for the 2-arg RemoveAutoGeneratedBetween()? 
This function only tests the "...Since()" functionality.

[Use mkwst_at_chromium.org plz., 2012/02/17 10:12:36]

Done.

   Time now = Time::Now();
   TimeDelta one_day = TimeDelta::FromDays(1);
   Time month_ago = now - TimeDelta::FromDays(30);
 
   // Nothing has been added.
   EXPECT_EQ(0U, model()->GetTemplateURLs().size());
 
   // Create one with a 0 time.
   AddKeywordWithDate("key1", false, "http://foo1", "http://suggest1",
                      "http://icon1", "UTF-8;UTF-16", "name1", true, Time(),
@@ skipping 41 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("key6"), model()->GetTemplateURLs()[2]->keyword());
   EXPECT_FALSE(model()->GetTemplateURLs()[2]->safe_for_autoreplace());
   EXPECT_EQ(month_ago.ToInternalValue(),
             model()->GetTemplateURLs()[2]->date_created().ToInternalValue());
 
   // Try removing from Time=0. This should delete one more.
   model()->RemoveAutoGeneratedSince(Time());
   EXPECT_EQ(2U, model()->GetTemplateURLs().size());
 }
 
+TEST_F(TemplateURLServiceTest, ClearBrowsingData_KeywordsForOrigin) {

[Peter Kasting, 2012/02/16 18:16:35]

Nit: It might be nice to expand this test to have some cases that check that we
correctly enforce both the origin and date restrictions simultaneously.

[Use mkwst_at_chromium.org plz., 2012/02/17 10:12:36]

Done.

+  Time now = Time::Now();
+  TimeDelta one_day = TimeDelta::FromDays(1);
+  Time month_ago = now - TimeDelta::FromDays(30);
+
+  // Nothing has been added.
+  EXPECT_EQ(0U, model()->GetTemplateURLs().size());
+
+  // Create one for now and +/- 1 day.
+  AddKeywordWithDate("key1", false, "http://foo1", "http://suggest1",
+                     "http://icon2", "UTF-8;UTF-16", "name2", true,
+                     now - one_day, Time());
+  AddKeywordWithDate("key2", false, "http://foo2", "", "", "", "name2",
+                     true, now, Time());
+  AddKeywordWithDate("key3", false, "http://foo3", "", "", "", "name3",
+                     true, now + one_day, Time());
+
+  // We just added a few items, validate them.
+  EXPECT_EQ(3U, model()->GetTemplateURLs().size());
+
+  // Try removing foo2. This should delete foo2, but leave foo1 and 3 untouched.
+  model()->RemoveAutoGeneratedForOriginBetween(month_ago, now + one_day,
+      GURL("http://foo2"));
+  EXPECT_EQ(2U, model()->GetTemplateURLs().size());
+  EXPECT_EQ(ASCIIToUTF16("key1"), model()->GetTemplateURLs()[0]->keyword());
+  EXPECT_TRUE(model()->GetTemplateURLs()[0]->safe_for_autoreplace());
+
+  EXPECT_EQ(ASCIIToUTF16("key3"), model()->GetTemplateURLs()[1]->keyword());
+  EXPECT_TRUE(model()->GetTemplateURLs()[1]->safe_for_autoreplace());
+
+  // Try removing foo1. This should delete foo1, but leave foo3 untouched.
+  model()->RemoveAutoGeneratedForOriginBetween(month_ago, now + one_day,
+      GURL("http://foo1"));
+  EXPECT_EQ(1U, model()->GetTemplateURLs().size());
+  EXPECT_EQ(ASCIIToUTF16("key3"), model()->GetTemplateURLs()[0]->keyword());
+  EXPECT_TRUE(model()->GetTemplateURLs()[0]->safe_for_autoreplace());
+}
+
 TEST_F(TemplateURLServiceTest, Reset) {
   // Add a new TemplateURL.
   VerifyLoad();
   const size_t initial_count = model()->GetTemplateURLs().size();
   TemplateURL* t_url = new TemplateURL();
   t_url->SetURL("http://www.google.com/foo/bar", 0, 0);
   t_url->set_keyword(ASCIIToUTF16("keyword"));
   t_url->set_short_name(ASCIIToUTF16("google"));
   GURL favicon_url("http://favicon.url");
   t_url->SetFaviconURL(favicon_url);
@@ skipping 687 matching lines @@
 
   // Reload the model to verify it was actually saved to the database and
   // assigned a new GUID when brought back.
   ResetModel(true);
   ASSERT_EQ(1 + initial_count, model()->GetTemplateURLs().size());
   const TemplateURL* loaded_url =
       model()->GetTemplateURLForKeyword(ASCIIToUTF16("keyword"));
   ASSERT_TRUE(loaded_url != NULL);
   ASSERT_FALSE(loaded_url->sync_guid().empty());
 }