Make SdchManager per-profile.

chrome/browser/net/sdch_dictionary_fetcher.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 "chrome/browser/net/sdch_dictionary_fetcher.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 SdchDictionaryFetcher::SdchDictionaryFetcher(
+    net::SdchManager* manager,
     net::URLRequestContextGetter* context)
-    : weak_factory_(this),
+    : manager_(manager),
+      weak_factory_(this),
       task_is_pending_(false),
       context_(context) {
   DCHECK(CalledOnValidThread());
+  DCHECK(manager);
 }
 
 SdchDictionaryFetcher::~SdchDictionaryFetcher() {
   DCHECK(CalledOnValidThread());
 }
 
-// static
-void SdchDictionaryFetcher::Shutdown() {
-  net::SdchManager::Shutdown();
-}
-
 void SdchDictionaryFetcher::Schedule(const GURL& dictionary_url) {
   DCHECK(CalledOnValidThread());
 
   // Avoid pushing duplicate copy onto queue.  We may fetch this url again later
   // and get a different dictionary, but there is no reason to have it in the
   // queue twice at one time.
   if (!fetch_queue_.empty() && fetch_queue_.back() == dictionary_url) {
     net::SdchManager::SdchErrorRecovery(
         net::SdchManager::DICTIONARY_ALREADY_SCHEDULED_TO_DOWNLOAD);
     return;
@@ skipping 12 matching lines @@
   if (fetch_queue_.empty() || current_fetch_.get() || task_is_pending_)
     return;
   base::MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&SdchDictionaryFetcher::StartFetching,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kMsDelayFromRequestTillDownload));
   task_is_pending_ = true;
 }
 
 void SdchDictionaryFetcher::StartFetching() {
+  DCHECK(CalledOnValidThread());
   DCHECK(task_is_pending_);
   task_is_pending_ = false;
 
   DCHECK(context_.get());
   current_fetch_.reset(net::URLFetcher::Create(
       fetch_queue_.front(), net::URLFetcher::GET, this));
   fetch_queue_.pop();
   current_fetch_->SetRequestContext(context_.get());
   current_fetch_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                net::LOAD_DO_NOT_SAVE_COOKIES);
   current_fetch_->Start();
 }
 
 void SdchDictionaryFetcher::OnURLFetchComplete(
     const net::URLFetcher* source) {
+  DCHECK(CalledOnValidThread());
   if ((200 == source->GetResponseCode()) &&
       (source->GetStatus().status() == net::URLRequestStatus::SUCCESS)) {
     std::string data;
     source->GetResponseAsString(&data);
-    net::SdchManager::Global()->AddSdchDictionary(data, source->GetURL());
+    manager_->AddSdchDictionary(data, source->GetURL());
   }
   current_fetch_.reset(NULL);
   ScheduleDelayedRun();
 }