Revert 282726 "Reland "Use upstream libaddressinput in Chrome.""

trunk/src/third_party/libaddressinput/chromium/chrome_downloader_impl.h

Index: trunk/src/third_party/libaddressinput/chromium/chrome_downloader_impl.h
===================================================================
--- trunk/src/third_party/libaddressinput/chromium/chrome_downloader_impl.h	(revision 282731)
+++ trunk/src/third_party/libaddressinput/chromium/chrome_downloader_impl.h	(working copy)
@@ -10,7 +10,7 @@
 
 #include "base/memory/scoped_vector.h"
 #include "net/url_request/url_fetcher_delegate.h"
-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/downloader.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/downloader.h"
 
 namespace net {
 class URLFetcher;
@@ -29,7 +29,7 @@
 
   // ::i18n::addressinput::Downloader:
   virtual void Download(const std::string& url,
-                        const Callback& downloaded) const OVERRIDE;
+                        scoped_ptr<Callback> downloaded) OVERRIDE;
 
   // net::URLFetcherDelegate:
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
@@ -38,19 +38,16 @@
   struct Request {
     Request(const std::string& url,
             scoped_ptr<net::URLFetcher> fetcher,
-            const Callback& callback);
+            scoped_ptr<Callback> callback);
 
     std::string url;
     // The data that's received.
     std::string data;
     // The object that manages retrieving the data.
     scoped_ptr<net::URLFetcher> fetcher;
-    const Callback& callback;
+    scoped_ptr<Callback> callback;
   };
 
-  // Non-const version of Download().
-  void DoDownload(const std::string& url, const Callback& downloaded);
-
   net::URLRequestContextGetter* const getter_;  // weak
 
   // Maps from active url fetcher to request metadata. The value is owned.