| Index: components/precache/core/precache_url_table_unittest.cc
|
| diff --git a/components/precache/core/precache_url_table_unittest.cc b/components/precache/core/precache_url_table_unittest.cc
|
| index 9053e58a96d65245b500bf457e293e0f04809a94..270c088ead182b20d01ddf2f8dbb09674af88b99 100644
|
| --- a/components/precache/core/precache_url_table_unittest.cc
|
| +++ b/components/precache/core/precache_url_table_unittest.cc
|
| @@ -35,7 +35,7 @@ class PrecacheURLTableTest : public testing::Test {
|
|
|
| TEST_F(PrecacheURLTableTest, AddURLWithNoExistingRow) {
|
| const base::Time kTime = base::Time::FromInternalValue(100);
|
| - precache_url_table_->AddURL(GURL("http://url.com"), kTime);
|
| + precache_url_table_->AddURL(GURL("http://url.com"), 1, true, kTime);
|
|
|
| std::map<GURL, base::Time> expected_map;
|
| expected_map[GURL("http://url.com")] = kTime;
|
| @@ -48,8 +48,8 @@ TEST_F(PrecacheURLTableTest, AddURLWithNoExistingRow) {
|
| TEST_F(PrecacheURLTableTest, AddURLWithExistingRow) {
|
| const base::Time kOldTime = base::Time::FromInternalValue(50);
|
| const base::Time kNewTime = base::Time::FromInternalValue(100);
|
| - precache_url_table_->AddURL(GURL("http://url.com"), kOldTime);
|
| - precache_url_table_->AddURL(GURL("http://url.com"), kNewTime);
|
| + precache_url_table_->AddURL(GURL("http://url.com"), 1, true, kOldTime);
|
| + precache_url_table_->AddURL(GURL("http://url.com"), 1, true, kNewTime);
|
|
|
| std::map<GURL, base::Time> expected_map;
|
| expected_map[GURL("http://url.com")] = kNewTime;
|
| @@ -63,8 +63,9 @@ TEST_F(PrecacheURLTableTest, DeleteURL) {
|
| const base::Time kStaysTime = base::Time::FromInternalValue(50);
|
| const base::Time kDeletedTime = base::Time::FromInternalValue(100);
|
|
|
| - precache_url_table_->AddURL(GURL("http://stays.com"), kStaysTime);
|
| - precache_url_table_->AddURL(GURL("http://deleted.com"), kDeletedTime);
|
| + precache_url_table_->AddURL(GURL("http://stays.com"), 1, true, kStaysTime);
|
| + precache_url_table_->AddURL(GURL("http://deleted.com"), 1, true,
|
| + kDeletedTime);
|
|
|
| precache_url_table_->DeleteURL(GURL("http://deleted.com"));
|
|
|
| @@ -76,17 +77,17 @@ TEST_F(PrecacheURLTableTest, DeleteURL) {
|
| EXPECT_EQ(expected_map, actual_map);
|
| }
|
|
|
| -TEST_F(PrecacheURLTableTest, HasURL) {
|
| - EXPECT_FALSE(precache_url_table_->HasURL(GURL("http://url.com")));
|
| +TEST_F(PrecacheURLTableTest, IsURLPrecached) {
|
| + EXPECT_FALSE(precache_url_table_->IsURLPrecached(GURL("http://url.com")));
|
|
|
| - precache_url_table_->AddURL(GURL("http://url.com"),
|
| + precache_url_table_->AddURL(GURL("http://url.com"), 1, true,
|
| base::Time::FromInternalValue(100));
|
|
|
| - EXPECT_TRUE(precache_url_table_->HasURL(GURL("http://url.com")));
|
| + EXPECT_TRUE(precache_url_table_->IsURLPrecached(GURL("http://url.com")));
|
|
|
| precache_url_table_->DeleteURL(GURL("http://url.com"));
|
|
|
| - EXPECT_FALSE(precache_url_table_->HasURL(GURL("http://url.com")));
|
| + EXPECT_FALSE(precache_url_table_->IsURLPrecached(GURL("http://url.com")));
|
| }
|
|
|
| TEST_F(PrecacheURLTableTest, DeleteAllPrecachedBefore) {
|
| @@ -95,10 +96,10 @@ TEST_F(PrecacheURLTableTest, DeleteAllPrecachedBefore) {
|
| const base::Time kEndTime = base::Time::FromInternalValue(30);
|
| const base::Time kAfterTime = base::Time::FromInternalValue(40);
|
|
|
| - precache_url_table_->AddURL(GURL("http://old.com"), kOldTime);
|
| - precache_url_table_->AddURL(GURL("http://before.com"), kBeforeTime);
|
| - precache_url_table_->AddURL(GURL("http://end.com"), kEndTime);
|
| - precache_url_table_->AddURL(GURL("http://after.com"), kAfterTime);
|
| + precache_url_table_->AddURL(GURL("http://old.com"), 1, true, kOldTime);
|
| + precache_url_table_->AddURL(GURL("http://before.com"), 1, true, kBeforeTime);
|
| + precache_url_table_->AddURL(GURL("http://end.com"), 1, true, kEndTime);
|
| + precache_url_table_->AddURL(GURL("http://after.com"), 1, true, kAfterTime);
|
|
|
| precache_url_table_->DeleteAllPrecachedBefore(kEndTime);
|
|
|
|
|