Fix binary patching for localized OS. Not sure how it was working till now....

chrome/installer/setup/main.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 54 matching lines @@
                           installed_version->GetString());
   file_util::AppendToPath(&existing_archive, installer::kInstallerDir);
   file_util::AppendToPath(&existing_archive, installer::kChromeArchive);
 
   std::wstring patch_archive(archive_path);
   file_util::AppendToPath(&patch_archive, installer::kChromePatchArchive);
 
   LOG(INFO) << "Applying patch " << patch_archive
             << " to file " << existing_archive
             << " and generating file " << uncompressed_archive;
-  return ApplyBinaryPatch(WideToUTF8(existing_archive).c_str(),
-                          WideToUTF8(patch_archive).c_str(),
-                          WideToUTF8(uncompressed_archive).c_str());
+  return ApplyBinaryPatch(existing_archive.c_str(),
+                          patch_archive.c_str(),
+                          uncompressed_archive.c_str());
 }
 
 
 // This method unpacks and uncompresses the given archive file. For Chrome
 // install we are creating a uncompressed archive that contains all the files
 // needed for the installer. This uncompressed archive is later compressed.
 //
 // This method first uncompresses archive specified by parameter "archive"
 // and assumes that it will result in an uncompressed full archive file
 // (chrome.7z) or uncompressed patch archive file (patch.7z). If it is patch
@@ skipping 31 matching lines @@
     if ((archive_name.size() >= prefix.size()) &&
         (std::equal(prefix.begin(), prefix.end(), archive_name.begin(),
                     CaseInsensitiveCompare<wchar_t>()))) {
       LOG(INFO) << "Differential patch found. Applying to existing archive.";
       incremental_install = true;
       if (!installed_version) {
         LOG(ERROR) << "Can not use differential update when Chrome is not "
                    << "installed on the system.";
         return 1;
       }
-      if (PatchArchiveFile(system_install, temp_path, uncompressed_archive,
-                           installed_version)) {
-        LOG(ERROR) << "Binary patching failed.";
+      if (int i = PatchArchiveFile(system_install, temp_path, 
+                                   uncompressed_archive, installed_version)) {
+        LOG(ERROR) << "Binary patching failed with error " << i;
         return 1;
       }
     }
 
     // If we got the uncompressed archive, lets unpack it
     LOG(INFO) << "Opening archive " << uncompressed_archive;
     if ((ret = util.OpenArchive(uncompressed_archive)) != NO_ERROR) {
       LOG(ERROR) << "Unable to open install archive: " <<
           uncompressed_archive;
     } else {
@@ skipping 188 matching lines @@
     install_status = InstallChrome(parsed_command_line,
                                    installed_version.get(),
                                    system_install);
   }
 
   CoUninitialize();
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return dist->GetInstallReturnCode(install_status);
 }