Merge r33241 to the 249 branch....

chrome/browser/browser_main_mac.mm

 // Copyright (c) 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 "chrome/browser/browser_main.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "app/app_switches.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "chrome/app/breakpad_mac.h"
-#import "chrome/app/keystone_glue.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/browser_main_win.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
+#import "chrome/browser/cocoa/keystone_glue.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
 
 namespace Platform {
 
 // Tell Cooca to finish its initalization, which we want to do manually
 // instead of calling NSApplicationMain(). The primary reason is that NSAM()
 // never returns, which would leave all the objects currently on the stack
 // in scoped_ptrs hanging and never cleaned up. We then load the main nib
@@ skipping 50 matching lines @@
 int HandleIconsCommands(const CommandLine& parsed_command_line) {
   return 0;
 }
 
 bool CheckMachineLevelInstall() {
   return false;
 }
 
 void PrepareRestartOnCrashEnviroment(const CommandLine& parsed_command_line) {
 }