Avoid advertising SDCH over HTTPS.

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"
 #include "net/base/sdch_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 //------------------------------------------------------------------------------
 // Provide sample data and compression results with a sample VCDIFF dictionary.
 // Note an SDCH dictionary has extra meta-data before the VCDIFF dictionary.
 static const char kTestVcdiffDictionary[] = "DictionaryFor"
     "SdchCompression1SdchCompression2SdchCompression3SdchCompression\n";
 
 //------------------------------------------------------------------------------
 
 class SdchManagerTest : public testing::Test {
  protected:
   SdchManagerTest()
     : sdch_manager_(new SdchManager) {
   }
 
+  // Reset globals back to default state.
+  virtual void TearDown() {
+    net::SdchManager::EnableSdchSupport(true);
+    net::SdchManager::EnableSecureSchemeSupport(false);

[mmenke, 2014/06/15 22:38:58]

nit:  net not needed.

[Randy Smith (Not in Mondays), 2014/06/15 23:37:17]

Done.

+  }
+
   scoped_ptr<SdchManager> sdch_manager_;  // A singleton database.
 };
 
 //------------------------------------------------------------------------------
 static std::string NewSdchDictionary(const std::string& domain) {
   std::string dictionary;
   if (!domain.empty()) {
     dictionary.append("Domain: ");
     dictionary.append(domain);
     dictionary.append("\n");
@@ skipping 122 matching lines @@
   sdch_manager_->GetAvailDictionaryList(
       GURL("https://" + dictionary_domain + "/test"),
       &dictionary_list);
   EXPECT_TRUE(dictionary_list.empty());
 }
 
 TEST_F(SdchManagerTest, CanUseHTTPSDictionaryOverHTTPSIfEnabled) {
   std::string dictionary_domain("x.y.z.google.com");
   std::string dictionary_text(NewSdchDictionary(dictionary_domain));
 
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_text,
-              GURL("https://" + dictionary_domain)));
+  EXPECT_FALSE(sdch_manager_->AddSdchDictionary(
+      dictionary_text, GURL("https://" + dictionary_domain)));
+  sdch_manager_->EnableSecureSchemeSupport(true);

[mmenke, 2014/06/15 22:38:58]

Think it's clearer this is a static function if you call
"SdchManager::EnableSdchSupport"

[Randy Smith (Not in Mondays), 2014/06/15 23:37:17]

Good point.  Done.

(Did both of these throughout the file.)

+  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(
+      dictionary_text, GURL("https://" + dictionary_domain)));
 
   GURL target_url("https://" + dictionary_domain + "/test");
   std::string dictionary_list;
   // HTTPS target URL should advertise dictionary if secure scheme support is
   // enabled.
-  sdch_manager_->EnableSecureSchemeSupport(true);
   sdch_manager_->GetAvailDictionaryList(target_url, &dictionary_list);
   EXPECT_FALSE(dictionary_list.empty());
 
   // Dictionary should be available.
   SdchManager::Dictionary* dictionary = NULL;
   std::string client_hash;
   std::string server_hash;
   sdch_manager_->GenerateHash(dictionary_text, &client_hash, &server_hash);
   sdch_manager_->GetVcdiffDictionary(server_hash, target_url, &dictionary);
   EXPECT_TRUE(dictionary != NULL);
@@ skipping 173 matching lines @@
   // And can reset them to false.
   sdch_manager_->SetAllowLatencyExperiment(url, false);
   EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url));
   EXPECT_TRUE(sdch_manager_->AllowLatencyExperiment(url2));
 
   sdch_manager_->SetAllowLatencyExperiment(url2, false);
   EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url));
   EXPECT_FALSE(sdch_manager_->AllowLatencyExperiment(url2));
 }
 
+TEST_F(SdchManagerTest, HttpsCorrectlySupported) {
+  GURL url("http://www.google.com");
+  GURL secure_url("https://www.google.com");
+
+  EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(url));
+  EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(secure_url));
+
+  sdch_manager_->EnableSecureSchemeSupport(true);
+  EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(url));
+  EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(secure_url));
+}
+
 }  // namespace net