Revert 282408 "Use upstream libaddressinput in Chrome."

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

Index: trunk/src/third_party/libaddressinput/chromium/chrome_storage_impl.h
===================================================================
--- trunk/src/third_party/libaddressinput/chromium/chrome_storage_impl.h	(revision 282425)
+++ trunk/src/third_party/libaddressinput/chromium/chrome_storage_impl.h	(working copy)
@@ -11,7 +11,8 @@
 #include "base/memory/scoped_vector.h"
 #include "base/prefs/pref_store.h"
 #include "base/scoped_observer.h"
-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/storage.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/storage.h"
+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/util/scoped_ptr.h"
 
 class WriteablePrefStore;
 
@@ -27,8 +28,9 @@
   virtual ~ChromeStorageImpl();
 
   // ::i18n::addressinput::Storage implementation.
-  virtual void Put(const std::string& key, std::string* data) OVERRIDE;
-  virtual void Get(const std::string& key, const Callback& data_ready)
+  virtual void Put(const std::string& key, scoped_ptr<std::string> data)
+      OVERRIDE;
+  virtual void Get(const std::string& key, scoped_ptr<Callback> data_ready)
       const OVERRIDE;
 
   // PrefStore::Observer implementation.
@@ -37,14 +39,14 @@
 
  private:
   struct Request {
-    Request(const std::string& key, const Callback& callback);
+    Request(const std::string& key, scoped_ptr<Callback> callback);
 
     std::string key;
-    const Callback& callback;
+    scoped_ptr<Callback> callback;
   };
 
   // Non-const version of Get().
-  void DoGet(const std::string& key, const Callback& data_ready);
+  void DoGet(const std::string& key, scoped_ptr<Callback> data_ready);
 
   WriteablePrefStore* backing_store_;  // weak