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

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

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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
Index: chrome/test/perf/startup_test.cc
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
index 3aa48dd4384754aaf0d8c1405d6da8b96c73a2a8..679d18029c6a1f19bdfc4441b9cc7634a00b14aa 100644
--- a/chrome/test/perf/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
@@ -119,7 +119,7 @@ class StartupTest : public UIPerfTest {
// Read in preferences template.
std::string pref_string;
EXPECT_TRUE(base::ReadFileToString(pref_template_path, &pref_string));
- string16 format_string = ASCIIToUTF16(pref_string);
+ base::string16 format_string = ASCIIToUTF16(pref_string);
// Make sure temp directory has the proper format for writing to prefs file.
#if defined(OS_POSIX)
@@ -133,7 +133,7 @@ class StartupTest : public UIPerfTest {
#endif
// Rewrite prefs file.
- std::vector<string16> subst;
+ std::vector<base::string16> subst;
subst.push_back(WideToUTF16(user_data_dir_w));
const std::string prefs_string =
UTF16ToASCII(ReplaceStringPlaceholders(format_string, subst, NULL));
« no previous file with comments | « chrome/test/perf/generate_profile.cc ('k') | chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698