Sdch view for net-internals

net/filter/sdch_filter_unittest.cc

Index: net/filter/sdch_filter_unittest.cc
diff --git a/net/filter/sdch_filter_unittest.cc b/net/filter/sdch_filter_unittest.cc
index 28da615c2e90bedd4b5c01dadf6ade807f8576f6..c35067fa6c4e1b0ba9943251e0c50188c5682aed 100644
--- a/net/filter/sdch_filter_unittest.cc
+++ b/net/filter/sdch_filter_unittest.cc
@@ -67,6 +67,8 @@ class SdchFilterTest : public testing::Test {
 
   std::string NewSdchCompressedData(const std::string dictionary);
 
+  bool AddDictionary(const std::string& text, const GURL& url);
+
   const std::string test_vcdiff_dictionary_;
   const std::string vcdiff_compressed_data_;
   const std::string expanded_;  // Desired final, decompressed data.
@@ -88,6 +90,11 @@ std::string SdchFilterTest::NewSdchCompressedData(
   return compressed;
 }
 
+bool SdchFilterTest::AddDictionary(const std::string& text, const GURL& url) {
+  SdchManager::AddResult rv = sdch_manager_->AddSdchDictionary(text, url);
+  return rv.added;
+}
+
 //------------------------------------------------------------------------------
 
 
@@ -387,10 +394,10 @@ TEST_F(SdchFilterTest, DictionaryAddOnce) {
 
   std::string url_string = "http://" + kSampleDomain;
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   // Check we can't add it twice.
-  EXPECT_FALSE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_FALSE(AddDictionary(dictionary, url));
 
   const std::string kSampleDomain2 = "sdchtest2.com";
 
@@ -401,7 +408,7 @@ TEST_F(SdchFilterTest, DictionaryAddOnce) {
 
     std::string url_string2 = "http://" + kSampleDomain2;
     GURL url2(url_string2);
-    EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary2, url2));
+    EXPECT_TRUE(AddDictionary(dictionary2, url2));
   }
 }
 
@@ -413,7 +420,7 @@ TEST_F(SdchFilterTest, BasicDictionary) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -450,7 +457,7 @@ TEST_F(SdchFilterTest, NoDecodeHttps) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -480,7 +487,7 @@ TEST_F(SdchFilterTest, NoDecodeFtp) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -506,7 +513,7 @@ TEST_F(SdchFilterTest, NoDecodeFileColon) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -532,7 +539,7 @@ TEST_F(SdchFilterTest, NoDecodeAboutColon) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -558,7 +565,7 @@ TEST_F(SdchFilterTest, NoDecodeJavaScript) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -584,7 +591,7 @@ TEST_F(SdchFilterTest, CanStillDecodeHttp) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -610,7 +617,7 @@ TEST_F(SdchFilterTest, CrossDomainDictionaryUse) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string compressed(NewSdchCompressedData(dictionary));
 
@@ -649,13 +656,13 @@ TEST_F(SdchFilterTest, DictionaryPathValidation) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   // Create a dictionary with a path restriction, by prefixing dictionary.
   const std::string path("/special_path/bin");
   std::string dictionary_with_path("Path: " + path + "\n");
   dictionary_with_path.append(dictionary);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_with_path, url));
+  EXPECT_TRUE(AddDictionary(dictionary_with_path, url));
 
   std::string compressed_for_path(NewSdchCompressedData(dictionary_with_path));
 
@@ -703,16 +710,15 @@ TEST_F(SdchFilterTest, DictionaryPortValidation) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
-
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   // Create a dictionary with a port restriction, by prefixing old dictionary.
   const std::string port("502");
   std::string dictionary_with_port("Port: " + port + "\n");
   dictionary_with_port.append("Port: 80\n");  // Add default port.
   dictionary_with_port.append(dictionary);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary_with_port,
-                                            GURL(url_string + ":" + port)));
+  EXPECT_TRUE(
+      AddDictionary(dictionary_with_port, GURL(url_string + ":" + port)));
 
   std::string compressed_for_port(NewSdchCompressedData(dictionary_with_port));
 
@@ -833,7 +839,7 @@ TEST_F(SdchFilterTest, FilterChaining) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string sdch_compressed(NewSdchCompressedData(dictionary));
 
@@ -915,7 +921,7 @@ TEST_F(SdchFilterTest, DefaultGzipIfSdch) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string sdch_compressed(NewSdchCompressedData(dictionary));
 
@@ -971,7 +977,7 @@ TEST_F(SdchFilterTest, AcceptGzipSdchIfGzip) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string sdch_compressed(NewSdchCompressedData(dictionary));
 
@@ -1030,7 +1036,7 @@ TEST_F(SdchFilterTest, DefaultSdchGzipIfEmpty) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string sdch_compressed(NewSdchCompressedData(dictionary));
 
@@ -1086,7 +1092,7 @@ TEST_F(SdchFilterTest, AcceptGzipGzipSdchIfGzip) {
   std::string url_string = "http://" + kSampleDomain;
 
   GURL url(url_string);
-  EXPECT_TRUE(sdch_manager_->AddSdchDictionary(dictionary, url));
+  EXPECT_TRUE(AddDictionary(dictionary, url));
 
   std::string sdch_compressed(NewSdchCompressedData(dictionary));