Installer refactoring: using string16 instead of wstring for GoogleUpdateSettings.

chrome/installer/gcapi/gcapi.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.
 
 // NOTE: This code is a legacy utility API for partners to check whether
 //       Chrome can be installed and launched. Recent updates are being made
 //       to add new functionality. These updates use code from Chromium, the old
 //       coded against the win32 api directly. If you have an itch to shave a
 //       yak, feel free to re-write the old code too.
 
@@ skipping 584 matching lines @@
 
 int __stdcall GoogleChromeDaysSinceLastRun() {
   int days_since_last_run = std::numeric_limits<int>::max();
 
   if (IsChromeInstalled(HKEY_LOCAL_MACHINE) ||
       IsChromeInstalled(HKEY_CURRENT_USER)) {
     RegKey client_state(HKEY_CURRENT_USER,
                         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 &&

[huangs, 2014/07/07 19:29:24]

ReadValue() takes wstring, but I found other places in code where string16 gets
passed.

           base::StringToInt64(last_run, &last_run_value)) {
         Time last_run_time = Time::FromInternalValue(last_run_value);
         TimeDelta difference = Time::NowFromSystemTime() - last_run_time;
 
         // We can end up with negative numbers here, given changes in system
         // clock time or due to TimeDelta's int64 -> int truncation.
         int new_days_since_last_run = difference.InDays();
         if (new_days_since_last_run >= 0 &&
             new_days_since_last_run < days_since_last_run) {
           days_since_last_run = new_days_since_last_run;
@@ skipping 89 matching lines @@
   if (!IsChromeInstalled(HKEY_LOCAL_MACHINE) &&
       (shell_mode != GCAPI_INVOKED_STANDARD_SHELL ||
           !IsChromeInstalled(HKEY_CURRENT_USER))) {
     if (error_code)
       *error_code = RELAUNCH_ERROR_NOTINSTALLED;
     return FALSE;
   }
 
   // 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) {
       if (!_wcsicmp(installed_brandcode.c_str(), partner_brandcode_list[i])) {

[huangs, 2014/07/07 19:29:24]

Found other instances in code where _wcsicmp() is used on string16.

         valid_brandcode = true;
         break;
       }
     }
   }
 
   if (!valid_brandcode) {
     if (error_code)
       *error_code = RELAUNCH_ERROR_INVALID_PARTNER;
     return FALSE;
@@ skipping 53 matching lines @@
       key.WriteValue(kRelaunchAllowedAfterValue,
                      FormatDateOffsetByMonths(6)) != ERROR_SUCCESS ||
       !SetRelaunchExperimentLabels(relaunch_brandcode, shell_mode)) {
     if (error_code)
       *error_code = RELAUNCH_ERROR_RELAUNCH_FAILED;
     return FALSE;
   }
 
   return TRUE;
 }