Update from https://crrev.com/303153

net/url_request/sdch_dictionary_fetcher.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 "net/base/sdch_dictionary_fetcher.h"
+#include "net/url_request/sdch_dictionary_fetcher.h"
 
 #include <stdint.h>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/thread_task_runner_handle.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_throttler_manager.h"
 
 namespace {
 
 const int kBufferSize = 4096;
 
 }  // namespace
 
 namespace net {
 
 SdchDictionaryFetcher::SdchDictionaryFetcher(
-    SdchFetcher::Delegate* consumer,
-    URLRequestContext* context)
+    URLRequestContext* context,
+    const OnDictionaryFetchedCallback& callback)
     : next_state_(STATE_NONE),
       in_loop_(false),
-      consumer_(consumer),
       context_(context),
+      dictionary_fetched_callback_(callback),
       weak_factory_(this) {
   DCHECK(CalledOnValidThread());
-  DCHECK(consumer);
   DCHECK(context);
 }
 
 SdchDictionaryFetcher::~SdchDictionaryFetcher() {
   DCHECK(CalledOnValidThread());
 }
 
 void SdchDictionaryFetcher::Schedule(const GURL& dictionary_url) {
   DCHECK(CalledOnValidThread());
 
@@ skipping 105 matching lines @@
   DCHECK(CalledOnValidThread());
 
   // |rv| is ignored, as the result from the previous request doesn't
   // affect the next request.
 
   if (fetch_queue_.empty() || current_request_.get()) {
     next_state_ = STATE_NONE;
     return OK;
   }
 
-  current_request_ = context_->CreateRequest(
-      fetch_queue_.front(), IDLE, this, NULL);
+  current_request_ =
+      context_->CreateRequest(fetch_queue_.front(), IDLE, this, NULL);
   current_request_->SetLoadFlags(LOAD_DO_NOT_SEND_COOKIES |
                                  LOAD_DO_NOT_SAVE_COOKIES);
   buffer_ = new IOBuffer(kBufferSize);
   fetch_queue_.pop();
 
   next_state_ = STATE_REQUEST_STARTED;
   current_request_->Start();
 
   return OK;
 }
@@ skipping 29 matching lines @@
   if (!current_request_->Read(buffer_.get(), kBufferSize, &bytes_read)) {
     if (current_request_->status().is_io_pending())
       return ERR_IO_PENDING;
 
     if (current_request_->status().error() == OK) {
       // This "should never happen", but if it does the result will be
       // an infinite loop.  It's not clear how to handle a read failure
       // without a promise to invoke the callback at some point in the future,
       // so the request is failed.
       SdchManager::SdchErrorRecovery(SdchManager::DICTIONARY_FETCH_READ_FAILED);
-      DLOG(FATAL) <<
-          "URLRequest::Read() returned false without IO pending or error!";
+      DLOG(FATAL)
+          << "URLRequest::Read() returned false without IO pending or error!";
       return ERR_FAILED;
     }
 
     return current_request_->status().error();
   }
 
   if (bytes_read != 0)
     dictionary_.append(buffer_->data(), bytes_read);
   else
     next_state_ = STATE_REQUEST_COMPLETE;
 
   return OK;
 }
 
 int SdchDictionaryFetcher::DoCompleteRequest(int rv) {
   DCHECK(CalledOnValidThread());
 
   // If the dictionary was successfully fetched, add it to the manager.
   if (rv == OK)
-    consumer_->AddSdchDictionary(dictionary_, current_request_->url());
+    dictionary_fetched_callback_.Run(dictionary_, current_request_->url());
 
   current_request_.reset();
   buffer_ = NULL;
   dictionary_.clear();
 
   next_state_ = STATE_IDLE;
 
   return OK;
 }
 
 }  // namespace net