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

Unified Diff: chrome/installer/gcapi/gcapi_reactivation_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/installer/gcapi/gcapi_reactivation_test.cc
diff --git a/chrome/installer/gcapi/gcapi_reactivation_test.cc b/chrome/installer/gcapi/gcapi_reactivation_test.cc
index 0928fd7fb86d54a1122f8fe5c8ecdf9221ea09d9..144e61608f2e1c73874ade5eb75d391b5845db11 100644
--- a/chrome/installer/gcapi/gcapi_reactivation_test.cc
+++ b/chrome/installer/gcapi/gcapi_reactivation_test.cc
@@ -41,7 +41,8 @@ class GCAPIReactivationTest : public ::testing::Test {
return SetLastRunTimeString(hive, base::Int64ToString16(last_run_time));
}
- bool SetLastRunTimeString(HKEY hive, const string16& last_run_time_string) {
+ bool SetLastRunTimeString(HKEY hive,
+ const base::string16& last_run_time_string) {
const wchar_t* base_path =
(hive == HKEY_LOCAL_MACHINE) ?
google_update::kRegPathClientStateMedium :
@@ -58,7 +59,7 @@ class GCAPIReactivationTest : public ::testing::Test {
}
bool HasExperimentLabels(HKEY hive) {
- string16 client_state_path(google_update::kRegPathClientState);
+ base::string16 client_state_path(google_update::kRegPathClientState);
client_state_path.push_back(L'\\');
client_state_path.append(google_update::kChromeUpgradeCode);
« no previous file with comments | « chrome/installer/gcapi/gcapi_omaha_experiment_test.cc ('k') | chrome/installer/launcher_support/chrome_launcher_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698