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

Unified Diff: extensions/browser/admin_policy_unittest.cc

Issue 107803004: Add base:: to string16 in extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove a using Created 7 years 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/browser/admin_policy.cc ('k') | extensions/browser/extension_error.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/admin_policy_unittest.cc
diff --git a/extensions/browser/admin_policy_unittest.cc b/extensions/browser/admin_policy_unittest.cc
index f85e3ef5a66ad334def1a42c3647f644082e5aa1..13b3f03de78c153faf9fd66a7fafd225f05a60cb 100644
--- a/extensions/browser/admin_policy_unittest.cc
+++ b/extensions/browser/admin_policy_unittest.cc
@@ -64,7 +64,7 @@ TEST_F(ExtensionAdminPolicyTest, BlacklistedByDefault) {
TEST_F(ExtensionAdminPolicyTest, UserMayLoadRequired) {
CreateExtension(Manifest::COMPONENT);
EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, NULL, extension_.get(), NULL));
- string16 error;
+ base::string16 error;
EXPECT_TRUE(ap::UserMayLoad(NULL, NULL, NULL, NULL, extension_.get(),
&error));
EXPECT_TRUE(error.empty());
@@ -87,7 +87,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadNoBlacklist) {
base::ListValue blacklist;
EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
NULL));
- string16 error;
+ base::string16 error;
EXPECT_TRUE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
&error));
EXPECT_TRUE(error.empty());
@@ -106,7 +106,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadWhitelisted) {
blacklist.Append(new base::StringValue(extension_->id()));
EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, NULL, NULL, extension_.get(),
NULL));
- string16 error;
+ base::string16 error;
EXPECT_TRUE(ap::UserMayLoad(NULL, &whitelist, NULL, NULL, extension_.get(),
&error));
EXPECT_TRUE(error.empty());
@@ -121,7 +121,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadBlacklisted) {
blacklist.Append(new base::StringValue("*"));
EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
NULL));
- string16 error;
+ base::string16 error;
EXPECT_FALSE(ap::UserMayLoad(&blacklist, NULL, NULL, NULL, extension_.get(),
&error));
EXPECT_FALSE(error.empty());
@@ -170,7 +170,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayLoadAllowedTypes) {
TEST_F(ExtensionAdminPolicyTest, UserMayModifySettings) {
CreateExtension(Manifest::INTERNAL);
EXPECT_TRUE(ap::UserMayModifySettings(extension_.get(), NULL));
- string16 error;
+ base::string16 error;
EXPECT_TRUE(ap::UserMayModifySettings(extension_.get(), &error));
EXPECT_TRUE(error.empty());
@@ -184,7 +184,7 @@ TEST_F(ExtensionAdminPolicyTest, UserMayModifySettings) {
TEST_F(ExtensionAdminPolicyTest, MustRemainEnabled) {
CreateExtension(Manifest::EXTERNAL_POLICY_DOWNLOAD);
EXPECT_TRUE(ap::MustRemainEnabled(extension_.get(), NULL));
- string16 error;
+ base::string16 error;
EXPECT_TRUE(ap::MustRemainEnabled(extension_.get(), &error));
EXPECT_FALSE(error.empty());
« no previous file with comments | « extensions/browser/admin_policy.cc ('k') | extensions/browser/extension_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698