Index: sync/test/fake_server/fake_server_verifier.cc |
diff --git a/sync/test/fake_server/fake_server_verifier.cc b/sync/test/fake_server/fake_server_verifier.cc |
index 0a598c955c6073d0c086060f94642fcc49dc96d2..614f42612c818770177814d28edc23f2a501cf10 100644 |
--- a/sync/test/fake_server/fake_server_verifier.cc |
+++ b/sync/test/fake_server/fake_server_verifier.cc |
@@ -7,11 +7,11 @@ |
#include <stddef.h> |
#include <map> |
+#include <memory> |
#include <set> |
#include <vector> |
#include "base/json/json_writer.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/values.h" |
#include "sync/internal_api/public/base/model_type.h" |
#include "sync/test/fake_server/fake_server.h" |
@@ -76,7 +76,7 @@ FakeServerVerifier::~FakeServerVerifier() {} |
AssertionResult FakeServerVerifier::VerifyEntityCountByType( |
size_t expected_count, |
syncer::ModelType model_type) const { |
- scoped_ptr<base::DictionaryValue> entities = |
+ std::unique_ptr<base::DictionaryValue> entities = |
fake_server_->GetEntitiesAsDictionaryValue(); |
if (!entities.get()) { |
return DictionaryCreationAssertionFailure(); |
@@ -100,7 +100,7 @@ AssertionResult FakeServerVerifier::VerifyEntityCountByTypeAndName( |
size_t expected_count, |
syncer::ModelType model_type, |
const string& name) const { |
- scoped_ptr<base::DictionaryValue> entities = |
+ std::unique_ptr<base::DictionaryValue> entities = |
fake_server_->GetEntitiesAsDictionaryValue(); |
if (!entities.get()) { |
return DictionaryCreationAssertionFailure(); |
@@ -110,7 +110,7 @@ AssertionResult FakeServerVerifier::VerifyEntityCountByTypeAndName( |
base::ListValue* entity_list = NULL; |
size_t actual_count = 0; |
if (entities->GetList(model_type_string, &entity_list)) { |
- scoped_ptr<base::Value> name_value(new base::StringValue(name)); |
+ std::unique_ptr<base::Value> name_value(new base::StringValue(name)); |
for (base::ListValue::const_iterator it = entity_list->begin(); |
it != entity_list->end(); ++it) { |
if (name_value->Equals(*it)) { |