commit 11bf74db3a223c10a2286b62fa3b9ba6dbffb6db
author thestig <thestig@chromium.org> Mon Nov 24 20:14:42 2014
committer Commit bot <commit-bot@chromium.org> Mon Nov 24 20:15:50 2014
tree 04667da23823452d3a8776d9a027c3eb144abd96
parent f62e00050f20843892035e460db6fe99e0f381b2

Cleanup: Replace most base::ASCIIToWide with base::ASCIIToUTF16 in chrome/browser.

BUG=23581

Review URL: https://codereview.chromium.org/717783003

Cr-Commit-Position: refs/heads/master@{#305485}

chrome/browser/about_flags_unittest.cc

diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc
index 32fb1de..19e0b65 100644
--- a/chrome/browser/about_flags_unittest.cc
+++ b/chrome/browser/about_flags_unittest.cc
@@ -548,9 +548,9 @@
                                     std::string(kSwitch1) +
                                     std::string("=");
 #if defined(OS_WIN)
-  EXPECT_EQ(std::wstring::npos,
+  EXPECT_EQ(base::string16::npos,
             command_line.GetCommandLineString().find(
-                base::ASCIIToWide(switch1_with_equals)));
+                base::ASCIIToUTF16(switch1_with_equals)));
 #else
   EXPECT_EQ(std::string::npos,
             command_line.GetCommandLineString().find(switch1_with_equals));
@@ -561,9 +561,9 @@
                                     std::string(kSwitch2) +
                                     std::string("=");
 #if defined(OS_WIN)
-  EXPECT_NE(std::wstring::npos,
+  EXPECT_NE(base::string16::npos,
             command_line.GetCommandLineString().find(
-                base::ASCIIToWide(switch2_with_equals)));
+                base::ASCIIToUTF16(switch2_with_equals)));
 #else
   EXPECT_NE(std::string::npos,
             command_line.GetCommandLineString().find(switch2_with_equals));