Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: extensions/browser/api/declarative/deduping_factory_unittest.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/declarative/deduping_factory_unittest.cc
diff --git a/extensions/browser/api/declarative/deduping_factory_unittest.cc b/extensions/browser/api/declarative/deduping_factory_unittest.cc
index f4c335b7040441e9e41076b58ceb6a299649906e..ea494c6d51aa774edac845bdc1882c6ac0c0a333 100644
--- a/extensions/browser/api/declarative/deduping_factory_unittest.cc
+++ b/extensions/browser/api/declarative/deduping_factory_unittest.cc
@@ -4,8 +4,9 @@
#include "extensions/browser/api/declarative/deduping_factory.h"
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -72,8 +73,8 @@ scoped_refptr<const BaseClass> CreateFoo(const std::string& /*instance_type*/,
return scoped_refptr<const BaseClass>(new Foo(parameter));
}
-scoped_ptr<base::DictionaryValue> CreateDictWithParameter(int parameter) {
- scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
+std::unique_ptr<base::DictionaryValue> CreateDictWithParameter(int parameter) {
+ std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
dict->SetInteger("parameter", parameter);
return dict;
}
@@ -87,10 +88,10 @@ TEST(DedupingFactoryTest, InstantiationParameterized) {
factory.RegisterFactoryMethod(
kTypeName, DedupingFactory<BaseClass>::IS_PARAMETERIZED, &CreateFoo);
- scoped_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
- scoped_ptr<base::DictionaryValue> d2(CreateDictWithParameter(2));
- scoped_ptr<base::DictionaryValue> d3(CreateDictWithParameter(3));
- scoped_ptr<base::DictionaryValue> d4(CreateDictWithParameter(4));
+ std::unique_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
+ std::unique_ptr<base::DictionaryValue> d2(CreateDictWithParameter(2));
+ std::unique_ptr<base::DictionaryValue> d3(CreateDictWithParameter(3));
+ std::unique_ptr<base::DictionaryValue> d4(CreateDictWithParameter(4));
std::string error;
bool bad_message = false;
@@ -134,8 +135,8 @@ TEST(DedupingFactoryTest, InstantiationNonParameterized) {
factory.RegisterFactoryMethod(
kTypeName, DedupingFactory<BaseClass>::IS_NOT_PARAMETERIZED, &CreateFoo);
- scoped_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
- scoped_ptr<base::DictionaryValue> d2(CreateDictWithParameter(2));
+ std::unique_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
+ std::unique_ptr<base::DictionaryValue> d2(CreateDictWithParameter(2));
std::string error;
bool bad_message = false;
@@ -160,7 +161,7 @@ TEST(DedupingFactoryTest, TypeNames) {
factory.RegisterFactoryMethod(
kTypeName2, DedupingFactory<BaseClass>::IS_PARAMETERIZED, &CreateFoo);
- scoped_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
+ std::unique_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
std::string error;
bool bad_message = false;
@@ -180,7 +181,7 @@ TEST(DedupingFactoryTest, Clear) {
factory.RegisterFactoryMethod(
kTypeName, DedupingFactory<BaseClass>::IS_PARAMETERIZED, &CreateFoo);
- scoped_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
+ std::unique_ptr<base::DictionaryValue> d1(CreateDictWithParameter(1));
std::string error;
bool bad_message = false;

Powered by Google App Engine
This is Rietveld 408576698