Use upstream libaddressinput in Chrome.

third_party/libaddressinput/chromium/storage_test_runner.cc

Index: third_party/libaddressinput/chromium/storage_test_runner.cc
diff --git a/third_party/libaddressinput/chromium/cpp/test/storage_test_runner.cc b/third_party/libaddressinput/chromium/storage_test_runner.cc
similarity index 53%
rename from third_party/libaddressinput/chromium/cpp/test/storage_test_runner.cc
rename to third_party/libaddressinput/chromium/storage_test_runner.cc
index ff9895ee76de7bc6247ac724af12471ec1a6d2f4..b6cf5443ccd59cba0b26a6daee1ea34350bb67a2 100644
--- a/third_party/libaddressinput/chromium/cpp/test/storage_test_runner.cc
+++ b/third_party/libaddressinput/chromium/storage_test_runner.cc
@@ -1,22 +1,11 @@
-// Copyright (C) 2013 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Copyright 2014 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 "storage_test_runner.h"
+#include "third_party/libaddressinput/chromium/storage_test_runner.h"
 
-#include <libaddressinput/callback.h>
-
-#include <gtest/gtest.h>
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/libaddressinput/src/cpp/include/libaddressinput/callback.h"
 
 namespace i18n {
 namespace addressinput {
@@ -40,8 +29,8 @@ void StorageTestRunner::ClearValues() {
 }
 
 scoped_ptr<Storage::Callback> StorageTestRunner::BuildCallback() {
-  return ::i18n::addressinput::BuildCallback(
-      this, &StorageTestRunner::OnDataReady);
+  return scoped_ptr<Storage::Callback>(::i18n::addressinput::BuildCallback(
+      this, &StorageTestRunner::OnDataReady));
 }
 
 void StorageTestRunner::OnDataReady(bool success,
@@ -54,7 +43,8 @@ void StorageTestRunner::OnDataReady(bool success,
 
 void StorageTestRunner::GetWithoutPutReturnsEmptyData() {
   ClearValues();
-  storage_->Get("key", BuildCallback());
+  scoped_ptr<Storage::Callback> callback(BuildCallback());
+  storage_->Get("key", *callback);
 
   EXPECT_FALSE(success_);
   EXPECT_EQ("key", key_);
@@ -63,8 +53,9 @@ void StorageTestRunner::GetWithoutPutReturnsEmptyData() {
 
 void StorageTestRunner::GetReturnsWhatWasPut() {
   ClearValues();
-  storage_->Put("key", make_scoped_ptr(new std::string("value")));
-  storage_->Get("key", BuildCallback());
+  storage_->Put("key", "value");
+  scoped_ptr<Storage::Callback> callback(BuildCallback());
+  storage_->Get("key", *callback);
 
   EXPECT_TRUE(success_);
   EXPECT_EQ("key", key_);
@@ -73,9 +64,10 @@ void StorageTestRunner::GetReturnsWhatWasPut() {
 
 void StorageTestRunner::SecondPutOverwritesData() {
   ClearValues();
-  storage_->Put("key", make_scoped_ptr(new std::string("bad-value")));
-  storage_->Put("key", make_scoped_ptr(new std::string("good-value")));
-  storage_->Get("key", BuildCallback());
+  storage_->Put("key", "bad-value");
+  storage_->Put("key", "good-value");
+  scoped_ptr<Storage::Callback> callback(BuildCallback());
+  storage_->Get("key", *callback);
 
   EXPECT_TRUE(success_);
   EXPECT_EQ("key", key_);