Index: third_party/libaddressinput/chromium/storage_test_runner.cc |
diff --git a/third_party/libaddressinput/chromium/storage_test_runner.cc b/third_party/libaddressinput/chromium/storage_test_runner.cc |
index 453f0f292895382f94d166a35aea210b17e2b160..67e4b244fd4376fd04391f23f5d211190c7eadd2 100644 |
--- a/third_party/libaddressinput/chromium/storage_test_runner.cc |
+++ b/third_party/libaddressinput/chromium/storage_test_runner.cc |
@@ -35,8 +35,8 @@ void StorageTestRunner::ClearValues() { |
data_.clear(); |
} |
-scoped_ptr<Storage::Callback> StorageTestRunner::BuildCallback() { |
- return scoped_ptr<Storage::Callback>(::i18n::addressinput::BuildCallback( |
+std::unique_ptr<Storage::Callback> StorageTestRunner::BuildCallback() { |
+ return std::unique_ptr<Storage::Callback>(::i18n::addressinput::BuildCallback( |
this, &StorageTestRunner::OnDataReady)); |
} |
@@ -54,7 +54,7 @@ void StorageTestRunner::OnDataReady(bool success, |
void StorageTestRunner::GetWithoutPutReturnsEmptyData() { |
ClearValues(); |
- scoped_ptr<Storage::Callback> callback(BuildCallback()); |
+ std::unique_ptr<Storage::Callback> callback(BuildCallback()); |
storage_->Get("key", *callback); |
EXPECT_FALSE(success_); |
@@ -65,7 +65,7 @@ void StorageTestRunner::GetWithoutPutReturnsEmptyData() { |
void StorageTestRunner::GetReturnsWhatWasPut() { |
ClearValues(); |
storage_->Put("key", new std::string("value")); |
- scoped_ptr<Storage::Callback> callback(BuildCallback()); |
+ std::unique_ptr<Storage::Callback> callback(BuildCallback()); |
storage_->Get("key", *callback); |
EXPECT_TRUE(success_); |
@@ -77,7 +77,7 @@ void StorageTestRunner::SecondPutOverwritesData() { |
ClearValues(); |
storage_->Put("key", new std::string("bad-value")); |
storage_->Put("key", new std::string("good-value")); |
- scoped_ptr<Storage::Callback> callback(BuildCallback()); |
+ std::unique_ptr<Storage::Callback> callback(BuildCallback()); |
storage_->Get("key", *callback); |
EXPECT_TRUE(success_); |