Revert 30168 - Commit patch set from http://codereview.chromium.org/149796...

chrome/browser/shell_integration_win.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.
 
 #include "chrome/browser/shell_integration.h"
 
 #include <windows.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 
@@ skipping 97 matching lines @@
       std::wstring key_path(kChromeProtocols[i] + ShellUtil::kRegShellOpen);
       RegKey key(root_key, key_path.c_str(), KEY_READ);
       std::wstring value;
       if (!key.Valid() || !key.ReadValue(L"", &value))
         return UNKNOWN_DEFAULT_BROWSER;
       // Need to normalize path in case it's been munged.
       CommandLine command_line = CommandLine::FromString(value);
       std::wstring short_path;
       GetShortPathName(command_line.program().c_str(),
                        WriteInto(&short_path, MAX_PATH), MAX_PATH);
-      if (!FilePath::CompareEqualIgnoreCase(short_path, short_app_path))
+      if ((short_path.size() != short_app_path.size()) ||
+          (!std::equal(short_path.begin(),
+                       short_path.end(),
+                       short_app_path.begin(),
+                       CaseInsensitiveCompare<wchar_t>())))
         return NOT_DEFAULT_BROWSER;
     }
   }
   return IS_DEFAULT_BROWSER;
 }
 
 // There is no reliable way to say which browser is default on a machine (each
 // browser can have some of the protocols/shortcuts). So we look for only HTTP
 // protocol handler. Even this handler is located at different places in
 // registry on XP and Vista:
@@ skipping 16 matching lines @@
     std::wstring key_path(L"http");
     key_path.append(ShellUtil::kRegShellOpen);
     RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ);
     std::wstring app_cmd;
     if (key.Valid() && key.ReadValue(L"", &app_cmd) &&
         std::wstring::npos != StringToLowerASCII(app_cmd).find(L"firefox"))
       ff_default = true;
   }
   return ff_default;
 }