summaryrefslogtreecommitdiffstats
path: root/chrome/browser/about_flags_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 21:14:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 21:14:53 +0000
commit47e870bf26f0c01dafe611ec03c0139c735063df (patch)
tree43b29b36654d896cf3fd1bd3cc27b830c63522b0 /chrome/browser/about_flags_unittest.cc
parent883844f40f19b80880e0730a8e2836e6383d1400 (diff)
downloadchromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.zip
chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.gz
chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.bz2
Revert 184352
> Add utf_string_conversions to base namespace. > > This adds "using"s for all functions so those can be fixed in a separate pass. > > This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover. > > BUG= > > Review URL: https://codereview.chromium.org/12314090 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/12315071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags_unittest.cc')
-rw-r--r--chrome/browser/about_flags_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 2c2039d..9c2245e 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -251,7 +251,7 @@ TEST_F(AboutFlagsTest, CheckValues) {
#if defined(OS_WIN)
EXPECT_EQ(std::wstring::npos,
command_line.GetCommandLineString().find(
- base::ASCIIToWide(switch1_with_equals)));
+ ASCIIToWide(switch1_with_equals)));
#else
EXPECT_EQ(std::string::npos,
command_line.GetCommandLineString().find(switch1_with_equals));
@@ -264,7 +264,7 @@ TEST_F(AboutFlagsTest, CheckValues) {
#if defined(OS_WIN)
EXPECT_NE(std::wstring::npos,
command_line.GetCommandLineString().find(
- base::ASCIIToWide(switch2_with_equals)));
+ ASCIIToWide(switch2_with_equals)));
#else
EXPECT_NE(std::string::npos,
command_line.GetCommandLineString().find(switch2_with_equals));