Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/browser/chromeos/customization_document.cc

 // Copyright (c) 2011 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/chromeos/customization_document.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/system/statistics_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 
 // Manifest attributes names.
 
 namespace {
 
 const char kVersionAttr[] = "version";
 const char kDefaultAttr[] = "default";
 const char kInitialLocaleAttr[] = "initial_locale";
 const char kInitialTimezoneAttr[] = "initial_timezone";
 const char kKeyboardLayoutAttr[] = "keyboard_layout";
@@ skipping 260 matching lines @@
 
 void ServicesCustomizationDocument::StartFileFetch() {
   DCHECK(url_.is_valid());
   url_fetcher_.reset(new URLFetcher(url_, URLFetcher::GET, this));
   url_fetcher_->set_request_context(
       ProfileManager::GetDefaultProfile()->GetRequestContext());
   url_fetcher_->Start();
 }
 
 void ServicesCustomizationDocument::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
-  if (response_code == 200) {
+    const URLFetcher* source) {
+  if (source->response_code() == 200) {
+    std::string data;
+    source->GetResponseAsString(&data);
     LoadManifestFromString(data);
   } else {
     NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
     if (!network->Connected() && num_retries_ < kMaxFetchRetries) {
       num_retries_++;
       retry_timer_.Start(FROM_HERE,
                          base::TimeDelta::FromSeconds(kRetriesDelayInSec),
                          this, &ServicesCustomizationDocument::StartFileFetch);
       return;
     }
     LOG(ERROR) << "URL fetch for services customization failed:"
-               << " response code = " << response_code
-               << " URL = " << url.spec();
+               << " response code = " << source->response_code()
+               << " URL = " << source->url().spec();
   }
 }
 
 bool ServicesCustomizationDocument::ApplyCustomization() {
   // TODO(dpolukhin): apply customized apps, exts and support page.
   SetApplied(true);
   return true;
 }
 
 std::string ServicesCustomizationDocument::GetInitialStartPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(
       locale, kAppContentAttr, kInitialStartPageAttr);
 }
 
 std::string ServicesCustomizationDocument::GetSupportPage(
     const std::string& locale) const {
   return GetLocaleSpecificString(
       locale, kAppContentAttr, kSupportPageAttr);
 }
 
 }  // namespace chromeos