summaryrefslogtreecommitdiffstats
path: root/extensions/browser/management_policy_unittest.cc
diff options
context:
space:
mode:
authordbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 23:48:36 +0000
committerdbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 23:48:36 +0000
commit0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e (patch)
tree1a93cdeebef0515893b2e46e128b0bffc7db4648 /extensions/browser/management_policy_unittest.cc
parent74aba36cbf2749781784c705fb04e2bd7716cdff (diff)
downloadchromium_src-0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e.zip
chromium_src-0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e.tar.gz
chromium_src-0d163dc35365d2ae4b2a3dc8281f3ba8ee7be88e.tar.bz2
Add base:: to string16 in extensions/.
R=yoz@chromium.org BUG=329295 Review URL: https://codereview.chromium.org/107803004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/management_policy_unittest.cc')
-rw-r--r--extensions/browser/management_policy_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/browser/management_policy_unittest.cc b/extensions/browser/management_policy_unittest.cc
index 595ba29..20658f1 100644
--- a/extensions/browser/management_policy_unittest.cc
+++ b/extensions/browser/management_policy_unittest.cc
@@ -63,7 +63,7 @@ TEST_F(ManagementPolicyTest, RegisterAndUnregister) {
TEST_F(ManagementPolicyTest, UserMayLoad) {
// No providers registered.
- string16 error;
+ base::string16 error;
// The extension and location are irrelevant to the
// TestManagementPolicyProviders.
EXPECT_TRUE(policy_.UserMayLoad(NULL, &error));
@@ -92,7 +92,7 @@ TEST_F(ManagementPolicyTest, UserMayLoad) {
}
TEST_F(ManagementPolicyTest, UserMayModifySettings) {
// No providers registered.
- string16 error;
+ base::string16 error;
EXPECT_TRUE(policy_.UserMayModifySettings(NULL, &error));
EXPECT_TRUE(error.empty());
@@ -120,7 +120,7 @@ TEST_F(ManagementPolicyTest, UserMayModifySettings) {
TEST_F(ManagementPolicyTest, MustRemainEnabled) {
// No providers registered.
- string16 error;
+ base::string16 error;
EXPECT_FALSE(policy_.MustRemainEnabled(NULL, &error));
EXPECT_TRUE(error.empty());
@@ -148,7 +148,7 @@ TEST_F(ManagementPolicyTest, MustRemainEnabled) {
TEST_F(ManagementPolicyTest, MustRemainDisabled) {
// No providers registered.
- string16 error;
+ base::string16 error;
EXPECT_FALSE(policy_.MustRemainDisabled(NULL, NULL, &error));
EXPECT_TRUE(error.empty());
@@ -180,8 +180,8 @@ TEST_F(ManagementPolicyTest, MustRemainDisabled) {
TEST_F(ManagementPolicyTest, ErrorHandling) {
// The error parameter should be unchanged if no restriction was found.
std::string original_error = "Ceci est en effet une erreur.";
- string16 original_error16 = UTF8ToUTF16(original_error);
- string16 error = original_error16;
+ base::string16 original_error16 = UTF8ToUTF16(original_error);
+ base::string16 error = original_error16;
EXPECT_TRUE(policy_.UserMayLoad(NULL, &error));
EXPECT_EQ(original_error, UTF16ToUTF8(error));
EXPECT_TRUE(policy_.UserMayModifySettings(NULL, &error));