Merge r13384 to the 154 branch....

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.
 
 #include <algorithm>
 #include <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #include <new.h>
 
@@ skipping 69 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);
 }
 
 } // namespace
 
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info,
                                  TCHAR* command_line, int show_command) {
   // Register the invalid param handler and pure call handler to be able to
   // notify breakpad when it happens.
   _set_invalid_parameter_handler(InvalidParameter);
   _set_purecall_handler(PureCall);
   // Gather allocation failure.
   _set_new_handler(&OnNoMemory);
   // Make sure malloc() calls the new handler too.
   _set_new_mode(1);
 
   // The exit manager is in charge of calling the dtors of singleton objects.
   base::AtExitManager exit_manager;
 
   // Initialize the command line.
   CommandLine parsed_command_line;
   
   // 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;
     
 #ifdef _CRTDBG_MAP_ALLOC
   _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
   _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
 #else
   if (!parsed_command_line.HasSwitch(switches::kDisableBreakpad)) {
     _CrtSetReportMode(_CRT_ASSERT, 0);
   }
 #endif
@@ skipping 119 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 
   logging::CleanupChromeLogging();
 
   return rv;
 }