Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value…

net/url_request/url_request_http_job.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/url_request/url_request_http_job.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 310 matching lines @@
   // Handle the server notification of a new SDCH dictionary.
   SdchManager* sdch_manager(request()->context()->sdch_manager());
   if (sdch_manager) {
     SdchProblemCode rv = sdch_manager->IsInSupportedDomain(request()->url());
     if (rv != SDCH_OK) {
       // If SDCH is just disabled, it is not a real error.
       if (rv != SDCH_DISABLED && rv != SDCH_SECURE_SCHEME_NOT_SUPPORTED) {
         SdchManager::SdchErrorRecovery(rv);
         request()->net_log().AddEvent(
             NetLog::TYPE_SDCH_DECODING_ERROR,
-            base::Bind(&NetLogSdchResourceProblemCallback, rv));
+            base::Bind(NetLogSdchResourceProblemCallback, rv));
       }
     } else {
       const std::string name = "Get-Dictionary";
       std::string url_text;
       void* iter = NULL;
       // TODO(jar): We need to not fetch dictionaries the first time they are
       // seen, but rather wait until we can justify their usefulness.
       // For now, we will only fetch the first dictionary, which will at least
       // require multiple suggestions before we get additional ones for this
       // site. Eventually we should wait until a dictionary is requested
       // several times
       // before we even download it (so that we don't waste memory or
       // bandwidth).
       if (GetResponseHeaders()->EnumerateHeader(&iter, name, &url_text)) {
         // Resolve suggested URL relative to request url.
         GURL sdch_dictionary_url = request_->url().Resolve(url_text);
         if (sdch_dictionary_url.is_valid()) {
           rv = sdch_manager->OnGetDictionary(request_->url(),
                                              sdch_dictionary_url);
           if (rv != SDCH_OK) {
             SdchManager::SdchErrorRecovery(rv);
             request_->net_log().AddEvent(
                 NetLog::TYPE_SDCH_DICTIONARY_ERROR,
-                base::Bind(&NetLogSdchDictionaryFetchProblemCallback, rv,
+                base::Bind(NetLogSdchDictionaryFetchProblemCallback, rv,
                            sdch_dictionary_url, false));
           }
         }
       }
     }
   }
 
   // Handle the server signalling no SDCH encoding.
   if (dictionaries_advertised_) {
     // We are wary of proxies that discard or damage SDCH encoding. If a server
@@ skipping 172 matching lines @@
     bool advertise_sdch = sdch_manager != NULL && request()->method() != "POST";
     if (advertise_sdch) {
       SdchProblemCode rv = sdch_manager->IsInSupportedDomain(request()->url());
       if (rv != SDCH_OK) {
         advertise_sdch = false;
         // If SDCH is just disabled, it is not a real error.
         if (rv != SDCH_DISABLED && rv != SDCH_SECURE_SCHEME_NOT_SUPPORTED) {
           SdchManager::SdchErrorRecovery(rv);
           request()->net_log().AddEvent(
               NetLog::TYPE_SDCH_DECODING_ERROR,
-              base::Bind(&NetLogSdchResourceProblemCallback, rv));
+              base::Bind(NetLogSdchResourceProblemCallback, rv));
         }
       }
     }
     if (advertise_sdch) {
       dictionaries_advertised_ =
           sdch_manager->GetDictionarySet(request_->url());
     }
 
     // The AllowLatencyExperiment() is only true if we've successfully done a
     // full SDCH compression recently in this browser session for this host.
@@ skipping 957 matching lines @@
   return override_response_headers_.get() ?
              override_response_headers_.get() :
              transaction_->GetResponseInfo()->headers.get();
 }
 
 void URLRequestHttpJob::NotifyURLRequestDestroyed() {
   awaiting_callback_ = false;
 }
 
 }  // namespace net