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

chrome/service/cloud_print/cloud_print_url_fetcher.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/service/cloud_print/cloud_print_url_fetcher.h"
 
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/net/http_return.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
@@ skipping 32 matching lines @@
     const std::string& additional_headers) {
   StartRequestHelper(url,
                      URLFetcher::POST,
                      delegate,
                      max_retries,
                      post_data_mime_type,
                      post_data,
                      additional_headers);
 }
 
-  // URLFetcher::Delegate implementation.
-void CloudPrintURLFetcher::OnURLFetchComplete(
-    const URLFetcher* source,
-    const GURL& url,
-    const net::URLRequestStatus& status,
-    int response_code,
-    const net::ResponseCookies& cookies,
-    const std::string& data) {
-  VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << url
-          << ", response code: " << response_code;
+void CloudPrintURLFetcher::OnURLFetchComplete(const URLFetcher* source) {
+  VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << source->url()
+          << ", response code: " << source->response_code();
   // Make sure we stay alive through the body of this function.
   scoped_refptr<CloudPrintURLFetcher> keep_alive(this);
-  ResponseAction action = delegate_->HandleRawResponse(source,
-                                                       url,
-                                                       status,
-                                                       response_code,
-                                                       cookies,
-                                                       data);
+  std::string data;
+  CHECK(source->GetResponseAsString(&data));
+  ResponseAction action = delegate_->HandleRawResponse(
+      source,
+      source->url(),
+      source->status(),
+      source->response_code(),
+      source->cookies(),
+      data);
   if (action == CONTINUE_PROCESSING) {
     // If we are not using an OAuth token, and we got an auth error, we are
     // done. Else, the token may have been refreshed. Let us try again.
-    if ((RC_FORBIDDEN == response_code) &&
+    if ((RC_FORBIDDEN == source->response_code()) &&
         (!CloudPrintTokenStore::current() ||
          !CloudPrintTokenStore::current()->token_is_oauth())) {
       delegate_->OnRequestAuthError();
       return;
     }
     // We need to retry on all network errors.
-    if (!status.is_success() || (response_code != 200))
+    if (!source->status().is_success() || (source->response_code() != 200))
       action = RETRY_REQUEST;
     else
-      action = delegate_->HandleRawData(source, url, data);
+      action = delegate_->HandleRawData(source, source->url(), data);
 
     if (action == CONTINUE_PROCESSING) {
       // If the delegate is not interested in handling the raw response data,
       // we assume that a JSON response is expected. If we do not get a JSON
       // response, we will retry (to handle the case where we got redirected
       // to a non-cloudprint-server URL eg. for authentication).
       bool succeeded = false;
       DictionaryValue* response_dict = NULL;
       CloudPrintHelpers::ParseResponseJSON(data, &succeeded, &response_dict);
       if (response_dict)
         action = delegate_->HandleJSONData(source,
-                                           url,
+                                           source->url(),
                                            response_dict,
                                            succeeded);
       else
         action = RETRY_REQUEST;
     }
   }
   // Retry the request if needed.
   if (action == RETRY_REQUEST) {
     // Explicitly call ReceivedContentWasMalformed() to ensure the current
     // request gets counted as a failure for calculation of the back-off
@@ skipping 62 matching lines @@
 
 net::URLRequestContextGetter* CloudPrintURLFetcher::GetRequestContextGetter() {
   ServiceURLRequestContextGetter* getter =
       g_service_process->GetServiceURLRequestContextGetter();
   // Now set up the user agent for cloudprint.
   std::string user_agent = getter->user_agent();
   base::StringAppendF(&user_agent, " %s", kCloudPrintUserAgent);
   getter->set_user_agent(user_agent);
   return getter;
 }