rAc: use libaddressinput to validate international addresses.

third_party/libaddressinput/chromium/cpp/test/retriever_test.cc

Index: third_party/libaddressinput/chromium/cpp/test/retriever_test.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/retriever_test.cc b/third_party/libaddressinput/chromium/cpp/test/retriever_test.cc
index f1ba0893916efd737ceac0bd8b0c2f76479a8e1a..30a76c5d9128af5e5e245b36f9c5a1bc3bd604f9 100644
--- a/third_party/libaddressinput/chromium/cpp/test/retriever_test.cc
+++ b/third_party/libaddressinput/chromium/cpp/test/retriever_test.cc
@@ -55,12 +55,7 @@ std::string Wrap(const std::string& data,
 // Tests for Retriever object.
 class RetrieverTest : public testing::Test {
  protected:
-  RetrieverTest()
-      : storage_(NULL),
-        retriever_(),
-        success_(false),
-        key_(),
-        data_() {
+  RetrieverTest() : success_(false) {
     ResetRetriever(FakeDownloader::kFakeDataUrl);
   }
 
@@ -72,11 +67,8 @@ class RetrieverTest : public testing::Test {
   }
 
   void ResetRetriever(const std::string& url) {
-    storage_ = new FakeStorage;
-    retriever_.reset(
-        new Retriever(url,
-                      scoped_ptr<Downloader>(new FakeDownloader),
-                      scoped_ptr<Storage>(storage_)));
+    retriever_.reset(new Retriever(
+        url, scoped_ptr<Downloader>(new FakeDownloader), &storage_));
   }
 
   std::string GetUrlForKey(const std::string& key) {
@@ -87,7 +79,7 @@ class RetrieverTest : public testing::Test {
     return retriever_->GetKeyForUrl(url);
   }
 
-  Storage* storage_;  // Owned by |retriever_|.
+  FakeStorage storage_;
   scoped_ptr<Retriever> retriever_;
   bool success_;
   std::string key_;
@@ -148,7 +140,7 @@ class FaultyDownloader : public Downloader {
 TEST_F(RetrieverTest, FaultyDownloader) {
   Retriever bad_retriever(FakeDownloader::kFakeDataUrl,
                           scoped_ptr<Downloader>(new FaultyDownloader),
-                          scoped_ptr<Storage>(new FakeStorage));
+                          &storage_);
   bad_retriever.Retrieve(kKey, BuildCallback());
 
   EXPECT_FALSE(success_);
@@ -159,7 +151,7 @@ TEST_F(RetrieverTest, FaultyDownloader) {
 TEST_F(RetrieverTest, FaultyDownloaderFallback) {
   Retriever bad_retriever(FakeDownloader::kFakeDataUrl,
                           scoped_ptr<Downloader>(new FaultyDownloader),
-                          scoped_ptr<Storage>(new FakeStorage));
+                          &storage_);
   const char kFallbackDataKey[] = "data/US";
   bad_retriever.Retrieve(kFallbackDataKey, BuildCallback());
 
@@ -170,7 +162,7 @@ TEST_F(RetrieverTest, FaultyDownloaderFallback) {
 }
 
 TEST_F(RetrieverTest, NoChecksumAndTimestampWillRedownload) {
-  storage_->Put(kKey, kEmptyData);
+  storage_.Put(kKey, kEmptyData);
   retriever_->Retrieve(kKey, BuildCallback());
   EXPECT_TRUE(success_);
   EXPECT_EQ(kKey, key_);
@@ -179,8 +171,8 @@ TEST_F(RetrieverTest, NoChecksumAndTimestampWillRedownload) {
 }
 
 TEST_F(RetrieverTest, ChecksumAndTimestampWillNotRedownload) {
-  storage_->Put(kKey,
-                Wrap(kEmptyData, kEmptyDataChecksum, TimeToString(time(NULL))));
+  storage_.Put(kKey,
+               Wrap(kEmptyData, kEmptyDataChecksum, TimeToString(time(NULL))));
   retriever_->Retrieve(kKey, BuildCallback());
   EXPECT_TRUE(success_);
   EXPECT_EQ(kKey, key_);
@@ -188,7 +180,7 @@ TEST_F(RetrieverTest, ChecksumAndTimestampWillNotRedownload) {
 }
 
 TEST_F(RetrieverTest, OldTimestampWillRedownload) {
-  storage_->Put(kKey, Wrap(kEmptyData, kEmptyDataChecksum, "0"));
+  storage_.Put(kKey, Wrap(kEmptyData, kEmptyDataChecksum, "0"));
   retriever_->Retrieve(kKey, BuildCallback());
   EXPECT_TRUE(success_);
   EXPECT_EQ(kKey, key_);
@@ -197,11 +189,10 @@ TEST_F(RetrieverTest, OldTimestampWillRedownload) {
 }
 
 TEST_F(RetrieverTest, OldTimestampOkIfDownloadFails) {
-  storage_ = new FakeStorage;
   Retriever bad_retriever(FakeDownloader::kFakeDataUrl,
                           scoped_ptr<Downloader>(new FaultyDownloader),
-                          scoped_ptr<Storage>(storage_));
-  storage_->Put(kKey, Wrap(kEmptyData, kEmptyDataChecksum, "0"));
+                          &storage_);
+  storage_.Put(kKey, Wrap(kEmptyData, kEmptyDataChecksum, "0"));
   bad_retriever.Retrieve(kKey, BuildCallback());
   EXPECT_TRUE(success_);
   EXPECT_EQ(kKey, key_);
@@ -210,7 +201,7 @@ TEST_F(RetrieverTest, OldTimestampOkIfDownloadFails) {
 
 TEST_F(RetrieverTest, WrongChecksumWillRedownload) {
   static const char kNonEmptyData[] = "{\"non-empty\": \"data\"}";
-  storage_->Put(
+  storage_.Put(
       kKey,
       Wrap(kNonEmptyData, kEmptyDataChecksum, TimeToString(time(NULL))));
   retriever_->Retrieve(kKey, BuildCallback());
@@ -234,7 +225,7 @@ class HangingDownloader : public Downloader {
 TEST_F(RetrieverTest, RequestsDontStack) {
   Retriever slow_retriever(FakeDownloader::kFakeDataUrl,
                            scoped_ptr<Downloader>(new HangingDownloader),
-                           scoped_ptr<Storage>(new FakeStorage));
+                           &storage_);
 
   slow_retriever.Retrieve(kKey, BuildCallback());
   EXPECT_FALSE(success_);