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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: extensions/common/manifest_handlers/oauth2_manifest_unittest.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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
« no previous file with comments | « extensions/common/manifest_handlers/oauth2_manifest_handler.cc ('k') | extensions/common/manifest_handlers/offline_enabled_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/manifest_handlers/oauth2_manifest_unittest.cc
diff --git a/extensions/common/manifest_handlers/oauth2_manifest_unittest.cc b/extensions/common/manifest_handlers/oauth2_manifest_unittest.cc
index f09c97143b11ccbd3a7186276f64819aca473663..aaafc62027acf705ad8815f3796ee0936fac3099 100644
--- a/extensions/common/manifest_handlers/oauth2_manifest_unittest.cc
+++ b/extensions/common/manifest_handlers/oauth2_manifest_unittest.cc
@@ -42,19 +42,20 @@ class OAuth2ManifestTest : public ManifestTest {
CLIENT_ID_EMPTY
};
- scoped_ptr<base::DictionaryValue> CreateManifest(
+ std::unique_ptr<base::DictionaryValue> CreateManifest(
AutoApproveValue auto_approve,
bool extension_id_whitelisted,
ClientIdValue client_id) {
- scoped_ptr<base::DictionaryValue> manifest = base::DictionaryValue::From(
- base::test::ParseJson("{ \n"
- " \"name\": \"test\", \n"
- " \"version\": \"0.1\", \n"
- " \"manifest_version\": 2, \n"
- " \"oauth2\": { \n"
- " \"scopes\": [ \"scope1\" ], \n"
- " }, \n"
- "} \n"));
+ std::unique_ptr<base::DictionaryValue> manifest =
+ base::DictionaryValue::From(
+ base::test::ParseJson("{ \n"
+ " \"name\": \"test\", \n"
+ " \"version\": \"0.1\", \n"
+ " \"manifest_version\": 2, \n"
+ " \"oauth2\": { \n"
+ " \"scopes\": [ \"scope1\" ], \n"
+ " }, \n"
+ "} \n"));
EXPECT_TRUE(manifest);
switch (auto_approve) {
case AUTO_APPROVE_NOT_SET:
@@ -156,7 +157,7 @@ TEST_F(OAuth2ManifestTest, OAuth2SectionParsing) {
}
TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionNotOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -166,7 +167,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionNotOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionNotOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_FALSE, false, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -179,7 +180,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionNotOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionNotOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_TRUE, false, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -192,7 +193,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionNotOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionNotOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_INVALID, false, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -205,7 +206,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionNotOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_NOT_SET, true, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -215,7 +216,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveNotSetExtensionOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_FALSE, true, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -225,7 +226,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveFalseExtensionOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -235,7 +236,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveTrueExtensionOnWhitelist) {
}
TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionOnWhitelist) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_INVALID, true, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
std::string error;
@@ -248,7 +249,7 @@ TEST_F(OAuth2ManifestTest, AutoApproveInvalidExtensionOnWhitelist) {
TEST_F(OAuth2ManifestTest, InvalidClientId) {
{
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_NOT_SET);
ManifestData manifest(std::move(ext_manifest), "test");
std::string error;
@@ -256,7 +257,7 @@ TEST_F(OAuth2ManifestTest, InvalidClientId) {
}
{
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_EMPTY);
ManifestData manifest(std::move(ext_manifest), "test");
std::string error;
@@ -267,7 +268,7 @@ TEST_F(OAuth2ManifestTest, InvalidClientId) {
TEST_F(OAuth2ManifestTest, ComponentInvalidClientId) {
// Component Apps without auto_approve must include a client ID.
{
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_NOT_SET);
ManifestData manifest(std::move(ext_manifest), "test");
std::string error;
@@ -277,7 +278,7 @@ TEST_F(OAuth2ManifestTest, ComponentInvalidClientId) {
}
{
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_NOT_SET, false, CLIENT_ID_EMPTY);
ManifestData manifest(std::move(ext_manifest), "test");
std::string error;
@@ -289,7 +290,7 @@ TEST_F(OAuth2ManifestTest, ComponentInvalidClientId) {
TEST_F(OAuth2ManifestTest, ComponentWithChromeClientId) {
{
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_NOT_SET);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -298,7 +299,7 @@ TEST_F(OAuth2ManifestTest, ComponentWithChromeClientId) {
}
{
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_EMPTY);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
@@ -308,7 +309,7 @@ TEST_F(OAuth2ManifestTest, ComponentWithChromeClientId) {
}
TEST_F(OAuth2ManifestTest, ComponentWithStandardClientId) {
- scoped_ptr<base::DictionaryValue> ext_manifest =
+ std::unique_ptr<base::DictionaryValue> ext_manifest =
CreateManifest(AUTO_APPROVE_TRUE, true, CLIENT_ID_DEFAULT);
ManifestData manifest(std::move(ext_manifest), "test");
scoped_refptr<extensions::Extension> extension =
« no previous file with comments | « extensions/common/manifest_handlers/oauth2_manifest_handler.cc ('k') | extensions/common/manifest_handlers/offline_enabled_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698