Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / installer / gcapi / gcapi.cc

diff --git a/src/chrome/installer/gcapi/gcapi.cc b/src/chrome/installer/gcapi/gcapi.cc
index 3d73af0..ce03d85 100644 (file)
--- a/src/chrome/installer/gcapi/gcapi.cc
+++ b/src/chrome/installer/gcapi/gcapi.cc
@@ -478,7 +478,8 @@ BOOL __stdcall LaunchGoogleChrome() {
         if (process_handle.IsValid()) {
           HANDLE process_token = NULL;
           HANDLE user_token = NULL;
-          if (::OpenProcessToken(process_handle, TOKEN_DUPLICATE | TOKEN_QUERY,
+          if (::OpenProcessToken(process_handle.Get(),
+                                 TOKEN_DUPLICATE | TOKEN_QUERY,
                                  &process_token) &&
               ::DuplicateTokenEx(process_token,
                                  TOKEN_IMPERSONATE | TOKEN_QUERY |
@@ -503,18 +504,21 @@ BOOL __stdcall LaunchGoogleChrome() {
     }
   }
 
+  CommandLine chrome_command(chrome_exe_path);
+
   bool ret = false;
   ScopedComPtr<IProcessLauncher> ipl;
   if (SUCCEEDED(ipl.CreateInstance(__uuidof(ProcessLauncherClass),
                                    NULL,
                                    CLSCTX_LOCAL_SERVER))) {
-    if (SUCCEEDED(ipl->LaunchCmdLine(chrome_exe_path.value().c_str())))
+    if (SUCCEEDED(ipl->LaunchCmdLine(
+            chrome_command.GetCommandLineString().c_str())))
       ret = true;
     ipl.Release();
   } else {
     // Couldn't get Omaha's process launcher, Omaha may not be installed at
     // system level. Try just running Chrome instead.
-    ret = base::LaunchProcess(chrome_exe_path.value(),
+    ret = base::LaunchProcess(chrome_command.GetCommandLineString(),
                               base::LaunchOptions(),
                               NULL);
   }
@@ -602,7 +606,7 @@ int __stdcall GoogleChromeDaysSinceLastRun() {
                         kChromeRegClientStateKey,
                         KEY_QUERY_VALUE | KEY_WOW64_32KEY);
     if (client_state.Valid()) {
-      std::wstring last_run;
+      base::string16 last_run;
       int64 last_run_value = 0;
       if (client_state.ReadValue(google_update::kRegLastRunTimeField,
                                  &last_run) == ERROR_SUCCESS &&
@@ -669,7 +673,7 @@ BOOL __stdcall CanOfferReactivation(const wchar_t* brand_code,
   return TRUE;
 }
 
-BOOL __stdcall ReactivateChrome(wchar_t* brand_code,
+BOOL __stdcall ReactivateChrome(const wchar_t* brand_code,
                                 int shell_mode,
                                 DWORD* error_code) {
   BOOL result = FALSE;
@@ -715,7 +719,7 @@ BOOL __stdcall CanOfferRelaunch(const wchar_t** partner_brandcode_list,
 
   // b) the installed brandcode should belong to that partner (in
   // brandcode_list);
-  std::wstring installed_brandcode;
+  base::string16 installed_brandcode;
   bool valid_brandcode = false;
   if (GoogleUpdateSettings::GetBrand(&installed_brandcode)) {
     for (int i = 0; i < partner_brandcode_list_length; ++i) {