diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 18:18:01 +0000 |
| commit | ad65a3ee540552ecca50ebbf9382f1a4c718d383 (patch) | |
| tree | 68082d6d78331413eba2f799547026940c07e004 /extensions/browser/management_policy_unittest.cc | |
| parent | 750f4497a3b87a4a028d4d6ce3ce88e01314139c (diff) | |
| download | chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.zip chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.gz chromium_src-ad65a3ee540552ecca50ebbf9382f1a4c718d383.tar.bz2 | |
Update uses of UTF conversions in courgette/, device/, extensions/, google_apis/, gpu/, ipc/, media/, net/ to use the base:: namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/112963005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/management_policy_unittest.cc')
| -rw-r--r-- | extensions/browser/management_policy_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/browser/management_policy_unittest.cc b/extensions/browser/management_policy_unittest.cc index 20658f1..52373c1 100644 --- a/extensions/browser/management_policy_unittest.cc +++ b/extensions/browser/management_policy_unittest.cc @@ -180,14 +180,14 @@ 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."; - base::string16 original_error16 = UTF8ToUTF16(original_error); + base::string16 original_error16 = base::UTF8ToUTF16(original_error); base::string16 error = original_error16; EXPECT_TRUE(policy_.UserMayLoad(NULL, &error)); - EXPECT_EQ(original_error, UTF16ToUTF8(error)); + EXPECT_EQ(original_error, base::UTF16ToUTF8(error)); EXPECT_TRUE(policy_.UserMayModifySettings(NULL, &error)); - EXPECT_EQ(original_error, UTF16ToUTF8(error)); + EXPECT_EQ(original_error, base::UTF16ToUTF8(error)); EXPECT_FALSE(policy_.MustRemainEnabled(NULL, &error)); - EXPECT_EQ(original_error, UTF16ToUTF8(error)); + EXPECT_EQ(original_error, base::UTF16ToUTF8(error)); // Ensure no crashes if no error message was requested. EXPECT_TRUE(policy_.UserMayLoad(NULL, NULL)); @@ -201,11 +201,11 @@ TEST_F(ManagementPolicyTest, ErrorHandling) { // Make sure returned error is correct. error = original_error16; EXPECT_FALSE(policy_.UserMayLoad(NULL, &error)); - EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error); + EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error); error = original_error16; EXPECT_FALSE(policy_.UserMayModifySettings(NULL, &error)); - EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error); + EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error); error = original_error16; EXPECT_TRUE(policy_.MustRemainEnabled(NULL, &error)); - EXPECT_EQ(UTF8ToUTF16(TestProvider::expected_error()), error); + EXPECT_EQ(base::UTF8ToUTF16(TestProvider::expected_error()), error); } |