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

content/ppapi_plugin/ppapi_plugin_main.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 "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
-#include "content/common/main_function_params.h"
 #include "content/ppapi_plugin/ppapi_thread.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/main_function_params.h"
 #include "ppapi/proxy/proxy_module.h"
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
 #endif
 
 #if defined(OS_WIN)
 sandbox::TargetServices* g_target_services = NULL;
 #else
 void* g_target_services = 0;
 #endif
 
 // Main function for starting the PPAPI plugin process.
-int PpapiPluginMain(const MainFunctionParams& parameters) {
+int PpapiPluginMain(const content::MainFunctionParams& parameters) {
   const CommandLine& command_line = parameters.command_line;
 
 #if defined(OS_WIN)
   g_target_services = parameters.sandbox_info->target_services;
 #endif
 
   // If |g_target_services| is not null this process is sandboxed. One side
   // effect is that we can't pop dialogs like ChildProcess::WaitForDebugger()
   // does.
   if (command_line.HasSwitch(switches::kPpapiStartupDialog)) {
@@ skipping 14 matching lines @@
 
   ChildProcess ppapi_process;
   ppapi_process.set_main_thread(new PpapiThread(false));  // Not a broker.
 
   ppapi::proxy::ProxyModule::GetInstance()->SetFlashCommandLineArgs(
       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
 
   main_message_loop.Run();
   return 0;
 }