Split SdchManager::Dictionary out into separate class/file.

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 401 matching lines @@
 // See test CanSetExactMatchDictionary above for first try.
 TEST_F(SdchManagerTest, CanStillSetExactMatchDictionary) {
   std::string dictionary_domain("x.y.z.google.com");
   std::string dictionary_text(NewSdchDictionary(dictionary_domain));
 
   // Perfect match should *STILL* work.
   EXPECT_TRUE(AddSdchDictionary(dictionary_text,
                                 GURL("http://" + dictionary_domain)));
 }
 
-TEST_F(SdchManagerTest, PathMatch) {
-  bool (*PathMatch)(const std::string& path, const std::string& restriction) =
-      SdchManager::Dictionary::PathMatch;
-  // Perfect match is supported.
-  EXPECT_TRUE(PathMatch("/search", "/search"));
-  EXPECT_TRUE(PathMatch("/search/", "/search/"));
-
-  // Prefix only works if last character of restriction is a slash, or first
-  // character in path after a match is a slash. Validate each case separately.
-
-  // Rely on the slash in the path (not at the end of the restriction).
-  EXPECT_TRUE(PathMatch("/search/something", "/search"));
-  EXPECT_TRUE(PathMatch("/search/s", "/search"));
-  EXPECT_TRUE(PathMatch("/search/other", "/search"));
-  EXPECT_TRUE(PathMatch("/search/something", "/search"));
-
-  // Rely on the slash at the end of the restriction.
-  EXPECT_TRUE(PathMatch("/search/something", "/search/"));
-  EXPECT_TRUE(PathMatch("/search/s", "/search/"));
-  EXPECT_TRUE(PathMatch("/search/other", "/search/"));
-  EXPECT_TRUE(PathMatch("/search/something", "/search/"));
-
-  // Make sure less that sufficient prefix match is false.
-  EXPECT_FALSE(PathMatch("/sear", "/search"));
-  EXPECT_FALSE(PathMatch("/", "/search"));
-  EXPECT_FALSE(PathMatch(std::string(), "/search"));
-
-  // Add examples with several levels of direcories in the restriction.
-  EXPECT_FALSE(PathMatch("/search/something", "search/s"));
-  EXPECT_FALSE(PathMatch("/search/", "/search/s"));
-
-  // Make sure adding characters to path will also fail.
-  EXPECT_FALSE(PathMatch("/searching", "/search/"));
-  EXPECT_FALSE(PathMatch("/searching", "/search"));
-
-  // Make sure we're case sensitive.
-  EXPECT_FALSE(PathMatch("/ABC", "/abc"));
-  EXPECT_FALSE(PathMatch("/abc", "/ABC"));
-}
-
 // The following are only applicable while we have a latency test in the code,
 // and can be removed when that functionality is stripped.
 TEST_F(SdchManagerTest, LatencyTestControls) {
   GURL url("http://www.google.com");
   GURL url2("http://www.google2.com");
 
   // First make sure we default to false.
   EXPECT_FALSE(sdch_manager()->AllowLatencyExperiment(url));
   EXPECT_FALSE(sdch_manager()->AllowLatencyExperiment(url2));
 
@@ skipping 157 matching lines @@
   // It should be visible if looked up by hash whether expired or not.
   scoped_ptr<base::SimpleTestClock> clock(new base::SimpleTestClock);
   clock->SetNow(base::Time::Now());
   clock->Advance(base::TimeDelta::FromMinutes(5));
   SdchProblemCode problem_code;
   scoped_ptr<SdchManager::DictionarySet> hash_set(
       sdch_manager()->GetDictionarySetByHash(
           target_gurl, server_hash, &problem_code).Pass());
   ASSERT_TRUE(hash_set);
   ASSERT_EQ(SDCH_OK, problem_code);
-  const_cast<SdchManager::Dictionary*>(
-      hash_set->GetDictionary(server_hash))->SetClockForTesting(
-      clock.Pass());
+  const_cast<SdchDictionary*>(hash_set->GetDictionary(server_hash))
+      ->SetClockForTesting(clock.Pass());
 
   // 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) {
@@ skipping 31 matching lines @@
 
   sdch_manager()->RemoveObserver(&observer);
   EXPECT_EQ(1, observer.dictionary_used_notifications());
   EXPECT_EQ("xyzzy", observer.last_server_hash());
   sdch_manager()->OnDictionaryUsed("plugh");
   EXPECT_EQ(1, observer.dictionary_used_notifications());
   EXPECT_EQ("xyzzy", observer.last_server_hash());
 }
 
 }  // namespace net