| Index: net/base/sdch_manager_unittest.cc
|
| diff --git a/net/base/sdch_manager_unittest.cc b/net/base/sdch_manager_unittest.cc
|
| index f95e8eeb62a32d1e245d8e7c9397ec52342042f4..c8c73e9e9acb576ce04a1a8b478e72c369c8501c 100644
|
| --- a/net/base/sdch_manager_unittest.cc
|
| +++ b/net/base/sdch_manager_unittest.cc
|
| @@ -47,77 +47,77 @@ TEST_F(SdchManagerTest, DomainSupported) {
|
| GURL google_url("http://www.google.com");
|
|
|
| net::SdchManager::EnableSdchSupport(false);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| + EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(google_url));
|
| net::SdchManager::EnableSdchSupport(true);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(google_url));
|
| }
|
|
|
| TEST_F(SdchManagerTest, DomainBlacklisting) {
|
| GURL test_url("http://www.test.com");
|
| GURL google_url("http://www.google.com");
|
|
|
| - SdchManager::BlacklistDomain(test_url);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(test_url));
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| + sdch_manager_->BlacklistDomain(test_url);
|
| + EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(test_url));
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(google_url));
|
|
|
| - SdchManager::BlacklistDomain(google_url);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(google_url));
|
| + sdch_manager_->BlacklistDomain(google_url);
|
| + EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(google_url));
|
| }
|
|
|
| TEST_F(SdchManagerTest, DomainBlacklistingCaseSensitivity) {
|
| GURL test_url("http://www.TesT.com");
|
| GURL test2_url("http://www.tEst.com");
|
|
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(test_url));
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(test2_url));
|
| - SdchManager::BlacklistDomain(test_url);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(test2_url));
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(test_url));
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(test2_url));
|
| + sdch_manager_->BlacklistDomain(test_url);
|
| + EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(test2_url));
|
| }
|
|
|
| TEST_F(SdchManagerTest, BlacklistingReset) {
|
| GURL gurl("http://mytest.DoMain.com");
|
| std::string domain(gurl.host());
|
|
|
| - SdchManager::ClearBlacklistings();
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 0);
|
| - EXPECT_EQ(SdchManager::BlacklistDomainExponential(domain), 0);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| + sdch_manager_->ClearBlacklistings();
|
| + EXPECT_EQ(sdch_manager_->BlackListDomainCount(domain), 0);
|
| + EXPECT_EQ(sdch_manager_->BlacklistDomainExponential(domain), 0);
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(gurl));
|
| }
|
|
|
| TEST_F(SdchManagerTest, BlacklistingSingleBlacklist) {
|
| GURL gurl("http://mytest.DoMain.com");
|
| std::string domain(gurl.host());
|
| - SdchManager::ClearBlacklistings();
|
| + sdch_manager_->ClearBlacklistings();
|
|
|
| - SdchManager::Global()->BlacklistDomain(gurl);
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 1);
|
| - EXPECT_EQ(SdchManager::BlacklistDomainExponential(domain), 1);
|
| + sdch_manager_->BlacklistDomain(gurl);
|
| + EXPECT_EQ(sdch_manager_->BlackListDomainCount(domain), 1);
|
| + EXPECT_EQ(sdch_manager_->BlacklistDomainExponential(domain), 1);
|
|
|
| // Check that any domain lookup reduces the blacklist counter.
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 0);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| + EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(gurl));
|
| + EXPECT_EQ(sdch_manager_->BlackListDomainCount(domain), 0);
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(gurl));
|
| }
|
|
|
| TEST_F(SdchManagerTest, BlacklistingExponential) {
|
| GURL gurl("http://mytest.DoMain.com");
|
| std::string domain(gurl.host());
|
| - SdchManager::ClearBlacklistings();
|
| + sdch_manager_->ClearBlacklistings();
|
|
|
| int exponential = 1;
|
| for (int i = 1; i < 100; ++i) {
|
| - SdchManager::Global()->BlacklistDomain(gurl);
|
| - EXPECT_EQ(SdchManager::BlacklistDomainExponential(domain), exponential);
|
| + sdch_manager_->BlacklistDomain(gurl);
|
| + EXPECT_EQ(sdch_manager_->BlacklistDomainExponential(domain), exponential);
|
|
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), exponential);
|
| - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), exponential - 1);
|
| + EXPECT_EQ(sdch_manager_->BlackListDomainCount(domain), exponential);
|
| + EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(gurl));
|
| + EXPECT_EQ(sdch_manager_->BlackListDomainCount(domain), exponential - 1);
|
|
|
| // Simulate a large number of domain checks (which eventually remove the
|
| // blacklisting).
|
| - SdchManager::ClearDomainBlacklisting(domain);
|
| - EXPECT_EQ(SdchManager::BlackListDomainCount(domain), 0);
|
| - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(gurl));
|
| + sdch_manager_->ClearDomainBlacklisting(domain);
|
| + EXPECT_EQ(sdch_manager_->BlackListDomainCount(domain), 0);
|
| + EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(gurl));
|
|
|
| // Predict what exponential backoff will be.
|
| exponential = 1 + 2 * exponential;
|
|
|