SdchObserver: add OnDictionary{Added,Removed}

net/sdch/sdch_owner_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 "base/memory/memory_pressure_listener.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/simple_test_clock.h"
@@ skipping 281 matching lines @@
       return;
 
     base::RunLoop run_loop;
     base::Closure quit_closure(run_loop.QuitClosure());
     empty_url_request_jobs_callback = &quit_closure;
     run_loop.Run();
     empty_url_request_jobs_callback = NULL;
   }
 
   void SignalGetDictionaryAndClearJobs(GURL request_url, GURL dictionary_url) {
-    sdch_owner().OnGetDictionary(&sdch_manager_, request_url, dictionary_url);
+    sdch_owner().OnGetDictionary(request_url, dictionary_url);
     WaitForNoJobs();
   }
 
   // Create a unique (by hash) dictionary of the given size,
   // associate it with a unique URL, add it to the manager through
   // SdchOwner::OnDictionaryFetched(), and return whether that
   // addition was successful or not.
   bool CreateAndAddDictionary(size_t size,
                               std::string* server_hash_p,
                               base::Time last_used_time) {
@@ skipping 241 matching lines @@
                                      stale_newer));
 
   EXPECT_TRUE(CreateAndAddDictionary(kMaxSizeForTesting / 4, &server_hash_d3,
                                      stale_older));
 
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d1));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d2));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d3));
 
   // Use the oldest dictionary.
-  sdch_owner().OnDictionaryUsed(&sdch_manager(), server_hash_d3);
+  sdch_owner().OnDictionaryUsed(server_hash_d3);
 
   // The addition of a new dictionary should succeed, evicting only the
   // newer stale one.
   std::string server_hash_d4;
   EXPECT_TRUE(
       CreateAndAddDictionary(kMaxSizeForTesting / 2, &server_hash_d4, fresh));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d1));
   EXPECT_FALSE(DictionaryPresentInManager(server_hash_d2));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d3));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d4));
@@ skipping 18 matching lines @@
                                      stale_newer));
 
   EXPECT_TRUE(CreateAndAddDictionary(kMaxSizeForTesting / 4, &server_hash_d3,
                                      stale_older));
 
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d1));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d2));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d3));
 
   // Use the older dictionaries.
-  sdch_owner().OnDictionaryUsed(&sdch_manager(), server_hash_d2);
-  sdch_owner().OnDictionaryUsed(&sdch_manager(), server_hash_d3);
+  sdch_owner().OnDictionaryUsed(server_hash_d2);
+  sdch_owner().OnDictionaryUsed(server_hash_d3);
 
   // The addition of a new dictionary should fail, not evicting anything.
   std::string server_hash_d4;
   EXPECT_FALSE(
       CreateAndAddDictionary(kMaxSizeForTesting / 2, &server_hash_d4, fresh));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d1));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d2));
   EXPECT_TRUE(DictionaryPresentInManager(server_hash_d3));
   EXPECT_FALSE(DictionaryPresentInManager(server_hash_d4));
 }
@@ skipping 249 matching lines @@
   int old_count;
   {
     ClearOwner();
     base::DictionaryValue* dict = nullptr;
     ASSERT_TRUE(GetDictionaryForURL(pref_store_.get(), url, &hash, &dict));
     ASSERT_TRUE(dict->GetInteger("use_count", &old_count));
   }
 
   ResetOwner(false);
   ASSERT_TRUE(CompleteLoadFromURL(url, "0", true));
-  owner_->OnDictionaryUsed(manager_.get(), hash);
+  owner_->OnDictionaryUsed(hash);
 
   int new_count;
   {
     ClearOwner();
     base::DictionaryValue* dict = nullptr;
     ASSERT_TRUE(GetDictionaryForURL(pref_store_.get(), url, nullptr, &dict));
     ASSERT_TRUE(dict->GetInteger("use_count", &new_count));
   }
 
   EXPECT_EQ(old_count + 1, new_count);
@@ skipping 28 matching lines @@
 
   EXPECT_TRUE(CompleteLoadFromURL(url0, "0", true));
   EXPECT_TRUE(CompleteLoadFromURL(url1, "1", false));
 
   tester.ExpectTotalCount("Sdch3.NetworkBytesSpent", 1);
   tester.ExpectUniqueSample("Sdch3.NetworkBytesSpent",
                             CreateDictionary(url1, "1").size(), 1);
 }
 
 }  // namespace net