First pass at mobile (and other) SDCH limit revisions.

net/filter/sdch_filter_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 <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 376 matching lines @@
 
   std::string url_string = "http://" + kSampleDomain;
   GURL url(url_string);
   EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
 
   // Check we can't add it twice.
   EXPECT_FALSE(sdch_manager_->AddSdchDictionary(dictionary, url));
 
   const std::string kSampleDomain2 = "sdchtest2.com";
 
-  // Construct a second SDCH dictionary from a VCDIFF dictionary.
-  std::string dictionary2(NewSdchDictionary(kSampleDomain2));
+  // Don't test adding a second dictionary if our limits are tight.
+  if (SdchManager::kMaxDictionaryCount > 1) {
+    // Construct a second SDCH dictionary from a VCDIFF dictionary.
+    std::string dictionary2(NewSdchDictionary(kSampleDomain2));
 
-  std::string url_string2 = "http://" + kSampleDomain2;
-  GURL url2(url_string2);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary2, url2));
+    std::string url_string2 = "http://" + kSampleDomain2;
+    GURL url2(url_string2);
+    EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary2, url2));
+  }
 }
 
 TEST_F(SdchFilterTest, BasicDictionary) {
   // Construct a valid SDCH dictionary from a VCDIFF dictionary.
   const std::string kSampleDomain = "sdchtest.com";
   std::string dictionary(NewSdchDictionary(kSampleDomain));
 
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
@@ skipping 214 matching lines @@
                               filter.get(), &output));
   EXPECT_EQ(output.size(), 0u);  // No output written.
 
   EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(GURL(url_string)));
   EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(wrong_domain_url));
   sdch_manager_->ClearBlacklistings();
   EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(wrong_domain_url));
 }
 
 TEST_F(SdchFilterTest, DictionaryPathValidation) {
+  // Can't test path distinction between dictionaries if we aren't allowed
+  // more than one dictionary.
+  if (SdchManager::kMaxDictionaryCount <= 1)
+    return;
+
   // Construct a valid SDCH dictionary from a VCDIFF dictionary.
   const std::string kSampleDomain = "sdchtest.com";
   std::string dictionary(NewSdchDictionary(kSampleDomain));
 
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
   EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
 
   // Create a dictionary with a path restriction, by prefixing dictionary.
@@ skipping 29 matching lines @@
   EXPECT_FALSE(FilterTestData(compressed_for_path, feed_block_size,
                               output_block_size, filter.get(), &output));
   EXPECT_EQ(output.size(), 0u);  // No output written.
 
   EXPECT_FALSE(sdch_manager_->IsInSupportedDomain(GURL(url_string)));
   sdch_manager_->ClearBlacklistings();
   EXPECT_TRUE(sdch_manager_->IsInSupportedDomain(GURL(url_string)));
 }
 
 TEST_F(SdchFilterTest, DictionaryPortValidation) {
+  // Can't test port distinction between dictionaries if we aren't allowed
+  // more than one dictionary.
+  if (SdchManager::kMaxDictionaryCount <= 1)
+    return;
+
   // Construct a valid SDCH dictionary from a VCDIFF dictionary.
   const std::string kSampleDomain = "sdchtest.com";
   std::string dictionary(NewSdchDictionary(kSampleDomain));
 
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
   EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
 
 
@@ skipping 424 matching lines @@
 
   feed_block_size = 1;
   output_block_size = 1;
   output.clear();
   EXPECT_TRUE(FilterTestData(double_gzip_compressed_sdch, feed_block_size,
                              output_block_size, filter.get(), &output));
   EXPECT_EQ(output, expanded_);
 }
 
 }  // namespace net