SdchManager: remove EnableSdchSupport

net/base/sdch_manager_unittest.cc

 // Copyright 2014 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 <limits.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 82 matching lines @@
   std::string last_server_hash_;
   GURL last_dictionary_request_url_;
   GURL last_dictionary_url_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSdchObserver);
 };
 
 class SdchManagerTest : public testing::Test {
  protected:
   SdchManagerTest()
-      : sdch_manager_(new SdchManager),
-        default_support_(sdch_manager_->sdch_enabled()) { }
+      : sdch_manager_(new SdchManager) {}
 
   ~SdchManagerTest() override {}
 
   SdchManager* sdch_manager() { return sdch_manager_.get(); }
 
-  // Reset globals back to default state.
-  void TearDown() override {
-    SdchManager::EnableSdchSupport(default_support_);
-  }
-
   // Attempt to add a dictionary to the manager and probe for success or
   // failure.
   bool AddSdchDictionary(const std::string& dictionary_text,
                          const GURL& gurl) {
     return sdch_manager_->AddSdchDictionary(dictionary_text, gurl, nullptr) ==
            SDCH_OK;
   }
 
  private:
   scoped_ptr<SdchManager> sdch_manager_;
-  bool default_support_;
 };
 
 static std::string NewSdchDictionary(const std::string& domain) {
   std::string dictionary;
   if (!domain.empty()) {
     dictionary.append("Domain: ");
     dictionary.append(domain);
     dictionary.append("\n");
   }
   dictionary.append("\n");
   dictionary.append(kTestVcdiffDictionary, sizeof(kTestVcdiffDictionary) - 1);
   return dictionary;
 }
 
 TEST_F(SdchManagerTest, DomainSupported) {
   GURL google_url("http://www.google.com");
 
-  SdchManager::EnableSdchSupport(false);
-  EXPECT_EQ(SDCH_DISABLED, sdch_manager()->IsInSupportedDomain(google_url));
-  SdchManager::EnableSdchSupport(true);
   EXPECT_EQ(SDCH_OK, sdch_manager()->IsInSupportedDomain(google_url));
 }
 
 TEST_F(SdchManagerTest, DomainBlacklisting) {
   GURL test_url("http://www.test.com");
   GURL google_url("http://www.google.com");
 
   sdch_manager()->BlacklistDomain(test_url, SDCH_OK);
   EXPECT_EQ(SDCH_DOMAIN_BLACKLIST_INCLUDES_TARGET,
             sdch_manager()->IsInSupportedDomain(test_url));
@@ skipping 428 matching lines @@
   ASSERT_EQ(SDCH_OK, problem_code);
 
   // Make sure it's not visible for advertisement, but is visible
   // if looked up by hash.
   EXPECT_FALSE(sdch_manager()->GetDictionarySet(target_gurl));
   EXPECT_TRUE(sdch_manager()->GetDictionarySetByHash(
       target_gurl, server_hash, &problem_code));
   EXPECT_EQ(SDCH_OK, problem_code);
 }
 
 TEST_F(SdchManagerTest, SdchOnByDefault) {

[Randy Smith (Not in Mondays), 2015/08/17 17:34:05]

I'd just nuke this test.

[Elly Fong-Jones, 2015/08/17 18:27:22]

Done.

   GURL google_url("http://www.google.com");
   scoped_ptr<SdchManager> sdch_manager(new SdchManager);
 
   EXPECT_EQ(SDCH_OK, sdch_manager->IsInSupportedDomain(google_url));
-  SdchManager::EnableSdchSupport(false);
-  EXPECT_EQ(SDCH_DISABLED, sdch_manager->IsInSupportedDomain(google_url));
 }
 
 // Confirm dispatch of notification.
 TEST_F(SdchManagerTest, SdchDictionaryUsed) {
   MockSdchObserver observer;
   sdch_manager()->AddObserver(&observer);
 
   EXPECT_EQ(0, observer.dictionary_used_notifications());
   sdch_manager()->OnDictionaryUsed("xyzzy");
   EXPECT_EQ(1, observer.dictionary_used_notifications());
@@ skipping 33 matching lines @@
   EXPECT_EQ(server_hash, observer.last_server_hash());
 
   EXPECT_EQ(SDCH_OK, sdch_manager()->RemoveSdchDictionary(server_hash));
   EXPECT_EQ(1, observer.dictionary_removed_notifications());
   EXPECT_EQ(server_hash, observer.last_server_hash());
 
   sdch_manager()->RemoveObserver(&observer);
 }
 
 }  // namespace net