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

chrome/browser/sync/glue/http_bridge.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/sync/glue/http_bridge.h"
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
 #include "content/public/common/content_client.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/host_resolver.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 237 matching lines @@
     return;
 
   fetch_state_.aborted = true;
   BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
                             fetch_state_.url_poster);
   fetch_state_.url_poster = NULL;
   fetch_state_.error_code = net::ERR_ABORTED;
   http_post_completed_.Signal();
 }
 
-void HttpBridge::OnURLFetchComplete(const URLFetcher *source,
-                                    const GURL &url,
-                                    const net::URLRequestStatus &status,
-                                    int response_code,
-                                    const net::ResponseCookies &cookies,
-                                    const std::string &data) {
+void HttpBridge::OnURLFetchComplete(const URLFetcher *source) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   base::AutoLock lock(fetch_state_lock_);
   if (fetch_state_.aborted)
     return;
 
   fetch_state_.request_completed = true;
   fetch_state_.request_succeeded =
-      (net::URLRequestStatus::SUCCESS == status.status());
-  fetch_state_.http_response_code = response_code;
-  fetch_state_.error_code = status.error();
+      (net::URLRequestStatus::SUCCESS == source->status().status());
+  fetch_state_.http_response_code = source->response_code();
+  fetch_state_.error_code = source->status().error();
 
-  fetch_state_.response_content = data;
+  source->GetResponseAsString(&fetch_state_.response_content);
   fetch_state_.response_headers = source->response_headers();
 
   // End of the line for url_poster_. It lives only on the IO loop.
   // We defer deletion because we're inside a callback from a component of the
   // URLFetcher, so it seems most natural / "polite" to let the stack unwind.
   MessageLoop::current()->DeleteSoon(FROM_HERE, fetch_state_.url_poster);
   fetch_state_.url_poster = NULL;
 
   // Wake the blocked syncer thread in MakeSynchronousPost.
   // WARNING: DONT DO ANYTHING AFTER THIS CALL! |this| may be deleted!
   http_post_completed_.Signal();
 }
 
 }  // namespace browser_sync