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

 // 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.
 
 // Wrapper to the parameter list for the "main" entry points (browser, renderer,
 // 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"
 
 #if defined(OS_WIN)
 namespace sandbox {
 struct SandboxInterfaceInfo;
 }
 #elif defined(OS_MACOSX)
 namespace base {
 namespace mac {
 class ScopedNSAutoreleasePool;
 }
 }
 #endif
 
 class Task;
 
+namespace content {
+
 struct MainFunctionParams {
   explicit MainFunctionParams(const CommandLine& cl)
       : command_line(cl),
 #if defined(OS_WIN)
         sandbox_info(NULL),
 #elif defined(OS_MACOSX)
         autorelease_pool(NULL),
 #endif
         ui_task(NULL) {}
   const CommandLine& command_line;
 #if defined(OS_WIN)
   sandbox::SandboxInterfaceInfo* sandbox_info;
 #elif defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool* autorelease_pool;
 #endif
   // Used by InProcessBrowserTest. If non-null BrowserMain schedules this
   // task to run on the MessageLoop and BrowserInit is not invoked.
   Task* ui_task;
 };
 
-#endif  // CONTENT_COMMON_MAIN_FUNCTION_PARAMS_H_
+}  // namespace content
+
+#endif  // CONTENT_PUBLIC_COMMON_MAIN_FUNCTION_PARAMS_H_