| Index: chrome/test/perf/startup_test.cc
|
| diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
|
| index c190a34fd7f5a78039e522f505fe2d776c16b7e3..69138ff0f7e6788deca51dc896f9d8fd2e1eeeed 100644
|
| --- a/chrome/test/perf/startup_test.cc
|
| +++ b/chrome/test/perf/startup_test.cc
|
| @@ -119,7 +119,7 @@ class StartupTest : public UIPerfTest {
|
|
|
| // Make sure temp directory has the proper format for writing to prefs file.
|
| #if defined(OS_POSIX)
|
| - std::wstring user_data_dir_w(ASCIIToWide(user_data_dir().value()));
|
| + std::wstring user_data_dir_w(base::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 @@ class StartupTest : public UIPerfTest {
|
|
|
| // Rewrite prefs file.
|
| std::vector<string16> subst;
|
| - subst.push_back(WideToUTF16(user_data_dir_w));
|
| + subst.push_back(base::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(),
|
|
|