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

content/public/common/main_function_params.h

Index: content/public/common/main_function_params.h
===================================================================
--- content/public/common/main_function_params.h	(revision 107906)
+++ content/public/common/main_function_params.h	(working copy)
@@ -6,8 +6,8 @@
 // plugin) to shield the call sites from the differences between platforms
 // (e.g., POSIX doesn't need to pass any sandbox information).
 
-#ifndef CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
-#define CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
+#ifndef CONTENT_PUBLIC_COMMON_MAIN_FUNCTION_PARAMS_H_
+#define CONTENT_PUBLIC_COMMON_MAIN_FUNCTION_PARAMS_H_
 #pragma once
 
 #include "base/command_line.h"
@@ -26,6 +26,8 @@
 
 class Task;
 
+namespace content {
+
 struct MainFunctionParams {
   explicit MainFunctionParams(const CommandLine& cl)
       : command_line(cl),
@@ -46,4 +48,6 @@
   Task* ui_task;
 };
 
-#endif  // CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_COMMON_MAIN_FUNCTION_PARAMS_H_