Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1005)

Unified Diff: chrome/test/perf/startup_test.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/perf/page_cycler_test.cc ('k') | chrome/test/perf/tab_switching_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(),
« no previous file with comments | « chrome/test/perf/page_cycler_test.cc ('k') | chrome/test/perf/tab_switching_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698