Merge trunk r97497 and its many dependents to the 14.0.835 branch.

chrome/app/chrome_main.cc

 // Copyright (c) 2011 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/app/chrome_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
@@ skipping 47 matching lines @@
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/os_crash_dumps.h"
 #include "base/mach_ipc_mac.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/chrome_paths_internal.h"
+#include "chrome/common/mac/cfbundle_blocker.h"
 #include "content/browser/mach_broker_mac.h"
 #include "grit/chromium_strings.h"
 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <locale.h>
 #include <signal.h>
@@ skipping 503 matching lines @@
   // app quits. Each "main" needs to flush this pool right before it goes into
   // its main event loop to get rid of the cruft.
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 
 #if defined(OS_CHROMEOS)
   chromeos::BootTimesLoader::Get()->SaveChromeMainStats();
 #endif
 
 #if defined(OS_MACOSX)
   chrome_main::SetUpBundleOverrides();
+  chrome::common::mac::EnableCFBundleBlocker();
 #endif
 
   CommandLine::Init(argc, argv);
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   Profiling::ProcessStarted();
 
 #if defined(OS_POSIX)
   if (HandleVersionSwitches(command_line))
     return 0;  // Got a --version switch; exit with a success error code.
@@ skipping 293 matching lines @@
 
   if (SubprocessNeedsResourceBundle(process_type))
     ResourceBundle::CleanupSharedInstance();
 
   logging::CleanupChromeLogging();
 
   chrome_main::LowLevelShutdown();
 
   return exit_code;
 }