Type conversion fixes, content/ edition.

content/common/sandbox_win.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.
 
 #include "content/common/sandbox_win.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 175 matching lines @@
   if (!module) {
     // The module could have been loaded with a 8.3 short name. We check
     // the three most common cases: 'thelongname.dll' becomes
     // 'thelon~1.dll', 'thelon~2.dll' and 'thelon~3.dll'.
     std::wstring name(module_name);
     size_t period = name.rfind(L'.');
     DCHECK_NE(std::string::npos, period);
     DCHECK_LE(3U, (name.size() - period));
     if (period <= 8)
       return;
-    for (int ix = 0; ix < 3; ++ix) {
-      const wchar_t suffix[] = {'~', ('1' + ix), 0};
+    for (wchar_t ix = '1'; ix <= '3'; ++ix) {
+      const wchar_t suffix[] = {'~', ix, 0};
       std::wstring alt_name = name.substr(0, 6) + suffix;
       alt_name += name.substr(period, name.size());
       if (check_in_browser) {
         module = ::GetModuleHandleW(alt_name.c_str());
         if (!module)
           return;
         // We found it, but because it only has 6 significant letters, we
         // want to make sure it is the right one.
         if (!IsExpandedModuleName(module, module_name))
           return;
@@ skipping 551 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content