Create a content::UrlFetcher interface that lives in content/public/common and convert users to i...

chrome/browser/policy/device_management_service.cc

Index: chrome/browser/policy/device_management_service.cc
===================================================================
--- chrome/browser/policy/device_management_service.cc	(revision 107061)
+++ chrome/browser/policy/device_management_service.cc	(working copy)
@@ -45,8 +45,8 @@
   return false;
 }
 
-bool IsProtobufMimeType(const URLFetcher* source) {
-  return source->response_headers()->HasHeaderValue(
+bool IsProtobufMimeType(const content::URLFetcher* source) {
+  return source->GetResponseHeaders()->HasHeaderValue(
       "content-type", "application/x-protobuffer");
 }
 
@@ -212,17 +212,18 @@
                                        bool bypass_proxy) {
   URLFetcher* fetcher = URLFetcher::Create(0, job->GetURL(server_url_),
                                            URLFetcher::POST, this);
-  fetcher->set_load_flags(net::LOAD_DO_NOT_SEND_COOKIES |
-                          net::LOAD_DO_NOT_SAVE_COOKIES |
-                          net::LOAD_DISABLE_CACHE |
-                          (bypass_proxy ? net::LOAD_BYPASS_PROXY : 0));
-  fetcher->set_request_context(request_context_getter_.get());
+  fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
+                        net::LOAD_DO_NOT_SAVE_COOKIES |
+                        net::LOAD_DISABLE_CACHE |
+                        (bypass_proxy ? net::LOAD_BYPASS_PROXY : 0));
+  fetcher->SetRequestContext(request_context_getter_.get());
   job->ConfigureRequest(fetcher);
   pending_jobs_[fetcher] = job;
   fetcher->Start();
 }
 
-void DeviceManagementService::OnURLFetchComplete(const URLFetcher* source) {
+void DeviceManagementService::OnURLFetchComplete(
+    const content::URLFetcher* source) {
   JobFetcherMap::iterator entry(pending_jobs_.find(source));
   if (entry != pending_jobs_.end()) {
     DeviceManagementJob* job = entry->second;
@@ -232,12 +233,13 @@
     // proxy on the next try. Don't retry if this URLFetcher already bypassed
     // the proxy.
     bool retry = false;
-    if ((source->load_flags() & net::LOAD_BYPASS_PROXY) == 0) {
-      if (!source->status().is_success() && IsProxyError(source->status())) {
+    if ((source->GetLoadFlags() & net::LOAD_BYPASS_PROXY) == 0) {
+      if (!source->GetStatus().is_success() &&
+          IsProxyError(source->GetStatus())) {
         LOG(WARNING) << "Proxy failed while contacting dmserver.";
         retry = true;
-      } else if (source->status().is_success() &&
-                 source->was_fetched_via_proxy() &&
+      } else if (source->GetStatus().is_success() &&
+                 source->WasFetchedViaProxy() &&
                  !IsProtobufMimeType(source)) {
         // The proxy server can be misconfigured but pointing to an existing
         // server that replies to requests. Try to recover if a successful
@@ -254,8 +256,8 @@
     } else {
       std::string data;
       source->GetResponseAsString(&data);
-      job->HandleResponse(source->status(), source->response_code(),
-                          source->cookies(), data);
+      job->HandleResponse(source->GetStatus(), source->GetResponseCode(),
+                          source->GetCookies(), data);
     }
   } else {
     NOTREACHED() << "Callback from foreign URL fetcher";