Merge 13384 - Fix for invocation over deprecated protocol handler...

chrome/app/chrome_dll_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.
 
 // TODO(port): the ifdefs in here are a first step towards trying to determine
 // the correct abstraction for all the OS functionality required at this
 // stage of process initialization. It should not be taken as a final
 // abstraction.
 
 #include "build/build_config.h"
@@ skipping 106 matching lines @@
   // Get the breakpad pointer from chrome.exe
   typedef void (__stdcall *DumpProcessFunction)();
   DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>(
       ::GetProcAddress(::GetModuleHandle(L"chrome.exe"), "DumpProcess"));
   if (DumpProcess)
     DumpProcess();
 }
 
 #pragma optimize("", on)
 
-// Early versions of Chrome incorrectly registered a chromehtml: URL handler.
-// Later versions fixed the registration but in some cases (e.g. Vista and non-
-// admin installs) the fix could not be applied.  This prevents Chrome to be
-// launched with the incorrect format.
-// CORRECT: <broser.exe> -- "chromehtml:<url>"
-// INVALID: <broser.exe> "chromehtml:<url>"
-bool IncorrectChromeHtmlArguments(const std::wstring& command_line) {
-  const wchar_t kChromeHtml[] = L"-- \"chromehtml:";
-  const wchar_t kOffset = 5;  // Where chromehtml: starts in above
+// Early versions of Chrome incorrectly registered a chromehtml: URL handler,
+// which gives us nothing but trouble. Avoid launching chrome this way since
+// some apps fail to properly escape arguments.
+bool HasDeprecatedArguments(const std::wstring& command_line) {
+  const wchar_t kChromeHtml[] = L"chromehtml:";
   std::wstring command_line_lower = command_line;
-
   // We are only searching for ASCII characters so this is OK.
   StringToLowerASCII(&command_line_lower);
-
-  std::wstring::size_type pos = command_line_lower.find(
-      kChromeHtml + kOffset);
-
-  if (pos == std::wstring::npos)
-    return false;
-
-  // The browser is being launched with chromehtml: somewhere on the command
-  // line.  We will not launch unless it's preceded by the -- switch terminator.
-  if (pos >= kOffset) {
-    if (equal(kChromeHtml, kChromeHtml + arraysize(kChromeHtml) - 1,
-        command_line_lower.begin() + pos - kOffset)) {
-      return false;
-    }
-  }
-
-  return true;
+  std::wstring::size_type pos = command_line_lower.find(kChromeHtml);
+  return (pos != std::wstring::npos);
 }
 
 #endif  // OS_WIN
 
 #if defined(OS_LINUX)
 static void GtkFatalLogHandler(const gchar* log_domain,
                                GLogLevelFlags log_level,
                                const gchar* message,
                                gpointer userdata) {
   if (!log_domain)
@@ skipping 102 matching lines @@
   // Initialize the command line.
 #if defined(OS_WIN)
   CommandLine::Init(0, NULL);
 #else
   CommandLine::Init(argc, argv);
 #endif
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_WIN)
    // Must do this before any other usage of command line!
-  if (::IncorrectChromeHtmlArguments(parsed_command_line.command_line_string()))
+  if (HasDeprecatedArguments(parsed_command_line.command_line_string()))
     return 1;
 #endif
 
   int browser_pid;
   std::wstring process_type =
     parsed_command_line.GetSwitchValue(switches::kProcessType);
   if (process_type.empty()) {
     browser_pid = base::GetCurrentProcId();
   } else {
     std::wstring channel_name =
@@ skipping 140 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 #endif
 
   logging::CleanupChromeLogging();
 
   return rv;
 }