Move content_restriction.h and main_function_params.h to content/public/common, and put them in t...

chrome/browser/mac/relauncher.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/browser/mac/relauncher.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <AvailabilityMacros.h>
 #include <dlfcn.h>
 #include <string.h>
@@ skipping 10 matching lines @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/mac/install_from_dmg.h"
 #include "chrome/common/chrome_switches.h"
-#include "content/common/main_function_params.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/main_function_params.h"
 
 // RTLD_MAIN_ONLY is supported as of Mac OS X 10.5, but <dlfcn.h> does not
 // define it in the 10.5 SDK. It is present in the 10.6 SDK and is documented
 // as working on 10.5 and later. The source code for the version of dyld that
 // shipped in 10.5, dyld-95.3/src/dyldAPIs.cpp, confirms that this feature is
 // supported. Provide a fallback definition here.
 #if MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_5  // 10.5 SDK
 #define RTLD_MAIN_ONLY ((void*)-5)  // Search main executable only.
 #endif
 
@@ skipping 204 matching lines @@
     LOG(ERROR) << "kevent (monitor): unexpected event, filter " << event.filter
                << ", fflags " << event.fflags << ", ident " << event.ident;
     return;
   }
 }
 
 }  // namespace
 
 namespace internal {
 
-int RelauncherMain(const MainFunctionParams& main_parameters) {
+int RelauncherMain(const content::MainFunctionParams& main_parameters) {
   // CommandLine rearranges the order of the arguments returned by
   // main_parameters.argv(), rendering it impossible to determine which
   // arguments originally came before kRelauncherArgSeparator and which came
   // after. It's crucial to distinguish between these because only those
   // after the separator should be given to the relaunched process; it's also
   // important to not treat the path to the relaunched process as a "loose"
   // argument. NXArgc and NXArgv are pointers to the original argc and argv as
   // passed to main(), so use those. The typical mechanism to do this is to
   // provide "extern" declarations to access these, but they're only present
   // in the crt1.o start file. This function will be linked into the framework
@@ skipping 112 matching lines @@
   if (!dmg_bsd_device_name.empty()) {
     EjectAndTrashDiskImage(dmg_bsd_device_name);
   }
 
   return 0;
 }
 
 }  // namespace internal
 
 }  // namespace mac_relauncher