Add base:: to string16s in chrome/.

chrome/test/perf/startup_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 101 matching lines @@
     const base::FilePath pref_template_path(user_data_dir().
         AppendASCII("Default").
         AppendASCII("PreferencesTemplate"));
     const base::FilePath pref_path(user_data_dir().
         AppendASCII(TestingProfile::kTestUserProfileDir).
         AppendASCII("Preferences"));
 
     // 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)
     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
     // these to a separator that won't trigger escapes.
     std::replace(user_data_dir_w.begin(),
                  user_data_dir_w.end(), '\\', '/');
 #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));
     EXPECT_TRUE(file_util::WriteFile(pref_path, prefs_string.c_str(),
                                      prefs_string.size()));
     file_util::EvictFileFromSystemCache(pref_path);
   }
 
   // Runs a test which loads |tab_count| tabs on startup, either as command line
   // arguments or, if |restore_session| is true, by using session restore.
@@ skipping 326 matching lines @@
 }
 
 TEST_F(StartupTest, ProfilingScript1) {
   SetUpWithFileURL();
   SetUpWithProfiling();
   RunStartupTest("warm", "profiling_scripts1", WARM, NOT_IMPORTANT,
                  PerfUITestSuite::DEFAULT_THEME, 1, 0);
 }
 
 }  // namespace