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

chrome/browser/mac/relauncher.cc

Index: chrome/browser/mac/relauncher.cc
===================================================================
--- chrome/browser/mac/relauncher.cc	(revision 107906)
+++ chrome/browser/mac/relauncher.cc	(working copy)
@@ -28,9 +28,9 @@
 #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
@@ -255,7 +255,7 @@
 
 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