[Mac] Enforce proper usage of main app bundle and helper app bundle....

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2010 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 630 matching lines @@
   // * If Breakpad is disabled, we only turn on Crash Reporter for the
   //    Browser process in release mode.
   if (!parsed_command_line.HasSwitch(switches::kDisableBreakpad)) {
     bool disable_apple_crash_reporter = is_debug_build
                                         || mac_util::IsBackgroundOnlyProcess();
     if (!IsCrashReporterEnabled() && disable_apple_crash_reporter) {
       DebugUtil::DisableOSCrashDumps();
     }
   }
 
+#if defined(OS_MACOSX)
+  // Mac Chrome is packaged with a main app bundle and a helper app bundle.
+  // The main app bundle should only be used for the browser process, so it
+  // should never see a --type switch (switches::kProcessType).  Likewise,
+  // the helper should always have a --type switch.
+  //
+  // This check is done this late so there is already a call to
+  // mac_util::IsBackgroundOnlyProcess(), so there is no change in
+  // startup/initialization order.
+
+  // The helper's Info.plist marks it as a background only app.
+  if (mac_util::IsBackgroundOnlyProcess()) {
+    CHECK(parsed_command_line.HasSwitch(switches::kProcessType))
+        << "Helper application requires --type.";
+  } else {
+    CHECK(!parsed_command_line.HasSwitch(switches::kProcessType))
+        << "Main application forbids --type, saw \"" << process_type << "\".";
+  }
+#endif  // defined(OS_MACOSX)
+
   if (IsCrashReporterEnabled())
     InitCrashProcessInfo();
 #endif  // OS_MACOSX
 
   InitializeStatsTable(browser_pid, parsed_command_line);
 
   StatsScope<StatsCounterTimer>
       startup_timer(chrome::Counters::chrome_main());
 
   // Enable the heap profiler as early as possible!
@@ skipping 254 matching lines @@
 
   logging::CleanupChromeLogging();
 
 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
   // TODO(mark): See the TODO(mark) above at InitCrashReporter.
   DestructCrashReporter();
 #endif  // OS_MACOSX && GOOGLE_CHROME_BUILD
 
   return rv;
 }