| 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));
|
|
|