Revert 48186, 48196, 48198

chrome/installer/util/l10n_string_util.cc

 // Copyright (c) 2009 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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include <atlbase.h>
 #include <shlwapi.h>
 
@@ skipping 24 matching lines @@
 
   // We don't have ICU at this point, so we use win32 apis.
   LCID id = GetThreadLocale();
   int length = GetLocaleInfo(id, LOCALE_SISO639LANGNAME, 0, 0);
   if (0 == length) {
     language = L"en-us";
     return language;
   }
   length = GetLocaleInfo(id, LOCALE_SISO639LANGNAME,
                          WriteInto(&language, length), length);
-  DCHECK(length == static_cast<int>(language.length() + 1));
+  DCHECK(length == language.length() + 1);
   StringToLowerASCII(&language);
 
   // Add the country if we need it.
   std::wstring country;
   length = GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME, 0, 0);
   if (0 != length) {
     length = GetLocaleInfo(id, LOCALE_SISO3166CTRYNAME,
                            WriteInto(&country, length), length);
-    DCHECK(length == static_cast<int>(country.length() + 1));
+    DCHECK(length == country.length() + 1);
     StringToLowerASCII(&country);
     if (L"en" == language) {
       if (L"gb" == country) {
         language.append(L"-gb");
       } else {
         language.append(L"-us");
       }
     } else if (L"es" == language && L"es" != country) {
       language.append(L"-419");
     } else if (L"pt" == language) {
@@ skipping 198 matching lines @@
   DWORD count = static_cast<DWORD>(url_path.size() * 3);
   scoped_array<wchar_t> url_canon(new wchar_t[count]);
   HRESULT hr = ::UrlCanonicalizeW(url_path.c_str(), url_canon.get(),
                                   &count, URL_ESCAPE_UNSAFE);
   if (SUCCEEDED(hr))
     return std::wstring(url_canon.get());
   return url_path;
 }
 
 }  // namespace installer_util