diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-26 07:07:56 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-26 07:07:56 +0000 |
| commit | f729d7a55a06bb521176d8bc354c8d88b452e067 (patch) | |
| tree | e51eef22ad5119f1cb54501d46216debc235300d /components | |
| parent | 0af059171ce1156f75ff11191fe0bdebe70f1039 (diff) | |
| download | chromium_src-f729d7a55a06bb521176d8bc354c8d88b452e067.zip chromium_src-f729d7a55a06bb521176d8bc354c8d88b452e067.tar.gz chromium_src-f729d7a55a06bb521176d8bc354c8d88b452e067.tar.bz2 | |
Remove UTF string conversion functions from the global namespace.
BUG=330556
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/102993018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242519 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/autofill/core/browser/form_field_unittest.cc | 2 | ||||
| -rw-r--r-- | components/policy/core/common/policy_loader_win_unittest.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/components/autofill/core/browser/form_field_unittest.cc b/components/autofill/core/browser/form_field_unittest.cc index 2fb1a72..763d776 100644 --- a/components/autofill/core/browser/form_field_unittest.cc +++ b/components/autofill/core/browser/form_field_unittest.cc @@ -117,7 +117,7 @@ TEST(FormFieldTest, Match) { EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("\\bcon\\b"), FormField::MATCH_LABEL)); // Make sure the circumflex in 'crepe' is not treated as a word boundary. - field.label = UTF8ToUTF16("cr" "\xC3\xAA" "pe"); + field.label = base::UTF8ToUTF16("cr" "\xC3\xAA" "pe"); EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("\\bcr\\b"), FormField::MATCH_LABEL)); } diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc index fb60cc9..13a3ed0 100644 --- a/components/policy/core/common/policy_loader_win_unittest.cc +++ b/components/policy/core/common/policy_loader_win_unittest.cc @@ -38,6 +38,7 @@ #include "testing/gtest/include/gtest/gtest.h" using base::UTF8ToUTF16; +using base::UTF16ToUTF8; using base::win::RegKey; namespace policy { |