Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc |
diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc |
index c0d9f75908905f92e59ab0a2f937998595cbef13..eb78bc0012bc58b93654f80f76ff83f9bd9524f5 100644 |
--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc |
+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" |
+#include <memory> |
+ |
#include "base/json/json_string_value_serializer.h" |
#include "base/strings/utf_string_conversions.h" |
#include "build/build_config.h" |
@@ -77,7 +79,7 @@ TEST_F(OverrideSettingsTest, ParseManifest) { |
std::string manifest(kManifest); |
JSONStringValueDeserializer json(manifest); |
std::string error; |
- scoped_ptr<base::Value> root(json.Deserialize(NULL, &error)); |
+ std::unique_ptr<base::Value> root(json.Deserialize(NULL, &error)); |
ASSERT_TRUE(root); |
ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); |
scoped_refptr<Extension> extension = Extension::Create( |
@@ -120,7 +122,7 @@ TEST_F(OverrideSettingsTest, ParsePrepopulatedId) { |
std::string manifest(kPrepopulatedManifest); |
JSONStringValueDeserializer json(manifest); |
std::string error; |
- scoped_ptr<base::Value> root(json.Deserialize(NULL, &error)); |
+ std::unique_ptr<base::Value> root(json.Deserialize(NULL, &error)); |
ASSERT_TRUE(root); |
ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); |
scoped_refptr<Extension> extension = |
@@ -153,7 +155,7 @@ TEST_F(OverrideSettingsTest, ParseBrokenManifest) { |
std::string manifest(kBrokenManifest); |
JSONStringValueDeserializer json(manifest); |
std::string error; |
- scoped_ptr<base::Value> root(json.Deserialize(NULL, &error)); |
+ std::unique_ptr<base::Value> root(json.Deserialize(NULL, &error)); |
ASSERT_TRUE(root); |
ASSERT_TRUE(root->IsType(base::Value::TYPE_DICTIONARY)); |
scoped_refptr<Extension> extension = Extension::Create( |