SdchObserver: add OnDictionary{Added,Removed}

net/base/sdch_manager.cc

 // Copyright (c) 2012 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 "net/base/sdch_manager.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 85 matching lines @@
 
   // Explicitly confirm that we can't notify any observers anymore.
   CHECK(!observers_.might_have_observers());
 #endif
 }
 
 void SdchManager::ClearData() {
   blacklisted_domains_.clear();
   allow_latency_experiment_.clear();
   dictionaries_.clear();
-  FOR_EACH_OBSERVER(SdchObserver, observers_, OnClearDictionaries(this));
+  FOR_EACH_OBSERVER(SdchObserver, observers_, OnClearDictionaries());
 }
 
 // static
 void SdchManager::SdchErrorRecovery(SdchProblemCode problem) {
   UMA_HISTOGRAM_ENUMERATION("Sdch3.ProblemCodes_5", problem,
                             SDCH_MAX_PROBLEM_CODE);
 }
 
 // static
 void SdchManager::EnableSdchSupport(bool enabled) {
@@ skipping 96 matching lines @@
 
 SdchProblemCode SdchManager::OnGetDictionary(const GURL& request_url,
                                              const GURL& dictionary_url) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SdchProblemCode rv = CanFetchDictionary(request_url, dictionary_url);
   if (rv != SDCH_OK)
     return rv;
 
   FOR_EACH_OBSERVER(SdchObserver,
                     observers_,
-                    OnGetDictionary(this, request_url, dictionary_url));
+                    OnGetDictionary(request_url, dictionary_url));
 
   return SDCH_OK;
 }
 
 void SdchManager::OnDictionaryUsed(const std::string& server_hash) {
   FOR_EACH_OBSERVER(SdchObserver, observers_,
-                    OnDictionaryUsed(this, server_hash));
+                    OnDictionaryUsed(server_hash));
 }
 
 SdchProblemCode SdchManager::CanFetchDictionary(
     const GURL& referring_url,
     const GURL& dictionary_url) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   /* The user agent may retrieve a dictionary from the dictionary URL if all of
      the following are true:
        1 The dictionary URL host name matches the referrer URL host name and
            scheme.
@@ skipping 200 matching lines @@
   DVLOG(1) << "Loaded dictionary with client hash " << client_hash
            << " and server hash " << server_hash;
   SdchDictionary dictionary(dictionary_text, header_end + 2, client_hash,
                             server_hash, dictionary_url_normalized, domain,
                             path, expiration, ports);
   dictionaries_[server_hash] =
       new base::RefCountedData<SdchDictionary>(dictionary);
   if (server_hash_p)
     *server_hash_p = server_hash;
 
+  FOR_EACH_OBSERVER(SdchObserver, observers_,
+                    OnDictionaryAdded(dictionary_url, server_hash));
+
   return SDCH_OK;
 }
 
 SdchProblemCode SdchManager::RemoveSdchDictionary(
     const std::string& server_hash) {
   if (dictionaries_.find(server_hash) == dictionaries_.end())
     return SDCH_DICTIONARY_HASH_NOT_FOUND;
 
   dictionaries_.erase(server_hash);
+
+  FOR_EACH_OBSERVER(SdchObserver, observers_, OnDictionaryRemoved(server_hash));
+
   return SDCH_OK;
 }
 
 // static
 scoped_ptr<SdchManager::DictionarySet>
 SdchManager::CreateEmptyDictionarySetForTesting() {
   return scoped_ptr<DictionarySet>(new DictionarySet).Pass();
 }
 
 // For investigation of http://crbug.com/454198; remove when resolved.
@@ skipping 47 matching lines @@
       entry_dict->SetInteger("tries", it->second.count);
     entry_dict->SetInteger("reason", it->second.reason);
     entry_list->Append(entry_dict);
   }
   value->Set("blacklisted", entry_list);
 
   return value;
 }
 
 }  // namespace net