Make SdchManager per-profile.

net/base/sdch_manager.h

Index: net/base/sdch_manager.h
diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h
index 63a0e4ba52b031fc3432171f2fcc1d46b5e18c39..c760313284e2ee396323d5de71262daf97aef330 100644
--- a/net/base/sdch_manager.h
+++ b/net/base/sdch_manager.h
@@ -234,12 +234,6 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) {
   SdchManager();
   ~SdchManager();
 
-  // Discontinue fetching of dictionaries, as we're now shutting down.
-  static void Shutdown();
-
-  // Provide access to the single instance of this class.
-  static SdchManager* Global();
-
   // Record stats on various errors.
   static void SdchErrorRecovery(ProblemCodes problem);
 
@@ -263,24 +257,24 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) {
   // Used when filter errors are found from a given domain, but it is plausible
   // that the cause is temporary (such as application startup, where cached
   // entries are used, but a dictionary is not yet loaded).
-  static void BlacklistDomain(const GURL& url);
+  void BlacklistDomain(const GURL& url);
 
   // Used when SEVERE filter errors are found from a given domain, to prevent
   // further use of SDCH on that domain.
-  static void BlacklistDomainForever(const GURL& url);
+  void BlacklistDomainForever(const GURL& url);
 
   // Unit test only, this function resets enabling of sdch, and clears the
   // blacklist.
-  static void ClearBlacklistings();
+  void ClearBlacklistings();
 
   // Unit test only, this function resets the blacklisting count for a domain.
-  static void ClearDomainBlacklisting(const std::string& domain);
+  void ClearDomainBlacklisting(const std::string& domain);
 
   // Unit test only: indicate how many more times a domain will be blacklisted.
-  static int BlackListDomainCount(const std::string& domain);
+  int BlackListDomainCount(const std::string& domain);
 
   // Unit test only: Indicate what current blacklist increment is for a domain.
-  static int BlacklistDomainExponential(const std::string& domain);
+  int BlacklistDomainExponential(const std::string& domain);
 
   // Check to see if SDCH is enabled (globally), and the given URL is in a
   // supported domain (i.e., not blacklisted, and either the specific supported
@@ -343,9 +337,6 @@ class NET_EXPORT SdchManager : public NON_EXPORTED_BASE(base::NonThreadSafe) {
   // A map of dictionaries info indexed by the hash that the server provides.
   typedef std::map<std::string, Dictionary*> DictionaryMap;
 
-  // The one global instance of that holds all the data.
-  static SdchManager* global_;
-
   // Support SDCH compression, by advertising in headers.
   static bool g_sdch_enabled_;