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

Unified Diff: chrome/common/service_process_util_win.cc

Issue 93793010: Update uses of UTF conversions in chrome/common to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « chrome/common/service_process_util_unittest.cc ('k') | chrome/common/time_format_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/service_process_util_win.cc
diff --git a/chrome/common/service_process_util_win.cc b/chrome/common/service_process_util_win.cc
index 7e7754d732a5b19d32c65abdccadf944d005c184..fca7aa6c044661ba7f362076ed43997e7735233e 100644
--- a/chrome/common/service_process_util_win.cc
+++ b/chrome/common/service_process_util_win.cc
@@ -23,12 +23,12 @@ namespace {
const char* kTerminateEventSuffix = "_service_terminate_evt";
base::string16 GetServiceProcessReadyEventName() {
- return UTF8ToWide(
+ return base::UTF8ToWide(
GetServiceProcessScopedVersionedName("_service_ready"));
}
base::string16 GetServiceProcessTerminateEventName() {
- return UTF8ToWide(
+ return base::UTF8ToWide(
GetServiceProcessScopedVersionedName(kTerminateEventSuffix));
}
@@ -41,7 +41,7 @@ std::string GetServiceProcessAutoRunKey() {
std::string GetObsoleteServiceProcessAutoRunKey() {
base::FilePath user_data_dir;
PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
- std::string scoped_name = WideToUTF8(user_data_dir.value());
+ std::string scoped_name = base::WideToUTF8(user_data_dir.value());
std::replace(scoped_name.begin(), scoped_name.end(), '\\', '!');
std::replace(scoped_name.begin(), scoped_name.end(), '/', '!');
scoped_name.append("_service_run");
@@ -88,7 +88,7 @@ bool ForceServiceProcessShutdown(const std::string& version,
std::string versioned_name = version;
versioned_name.append(kTerminateEventSuffix);
base::string16 event_name =
- UTF8ToWide(GetServiceProcessScopedName(versioned_name));
+ base::UTF8ToWide(GetServiceProcessScopedName(versioned_name));
terminate_event.Set(OpenEvent(EVENT_MODIFY_STATE, FALSE, event_name.c_str()));
if (!terminate_event.IsValid())
return false;
@@ -153,10 +153,11 @@ bool ServiceProcessState::AddToAutoRun() {
// Remove the old autorun value first because we changed the naming scheme
// for the autorun value name.
base::win::RemoveCommandFromAutoRun(
- HKEY_CURRENT_USER, UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
+ HKEY_CURRENT_USER,
+ base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
return base::win::AddCommandToAutoRun(
HKEY_CURRENT_USER,
- UTF8ToWide(GetServiceProcessAutoRunKey()),
+ base::UTF8ToWide(GetServiceProcessAutoRunKey()),
autorun_command_line_->GetCommandLineString());
}
@@ -164,9 +165,10 @@ bool ServiceProcessState::RemoveFromAutoRun() {
// Remove the old autorun value first because we changed the naming scheme
// for the autorun value name.
base::win::RemoveCommandFromAutoRun(
- HKEY_CURRENT_USER, UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
+ HKEY_CURRENT_USER,
+ base::UTF8ToWide(GetObsoleteServiceProcessAutoRunKey()));
return base::win::RemoveCommandFromAutoRun(
- HKEY_CURRENT_USER, UTF8ToWide(GetServiceProcessAutoRunKey()));
+ HKEY_CURRENT_USER, base::UTF8ToWide(GetServiceProcessAutoRunKey()));
}
void ServiceProcessState::TearDownState() {
« no previous file with comments | « chrome/common/service_process_util_unittest.cc ('k') | chrome/common/time_format_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698