Revert 184352

chrome/test/perf/startup_test.cc

Index: chrome/test/perf/startup_test.cc
===================================================================
--- chrome/test/perf/startup_test.cc	(revision 184354)
+++ chrome/test/perf/startup_test.cc	(working copy)
@@ -119,7 +119,7 @@
 
     // Make sure temp directory has the proper format for writing to prefs file.
 #if defined(OS_POSIX)
-    std::wstring user_data_dir_w(base::ASCIIToWide(user_data_dir().value()));
+    std::wstring user_data_dir_w(ASCIIToWide(user_data_dir().value()));
 #elif defined(OS_WIN)
     std::wstring user_data_dir_w(user_data_dir().value());
     // In Windows, the FilePath will write '\' for the path separators; change
@@ -130,7 +130,7 @@
 
     // Rewrite prefs file.
     std::vector<string16> subst;
-    subst.push_back(base::WideToUTF16(user_data_dir_w));
+    subst.push_back(WideToUTF16(user_data_dir_w));
     const std::string prefs_string =
         UTF16ToASCII(ReplaceStringPlaceholders(format_string, subst, NULL));
     EXPECT_TRUE(file_util::WriteFile(pref_path, prefs_string.c_str(),
Property changes on: chrome/test/perf/startup_test.cc
___________________________________________________________________
Deleted: svn:mergeinfo