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

chrome/nacl/nacl_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 "build/build_config.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/system_monitor/system_monitor.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/nacl/nacl_listener.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "content/common/child_process.h"
 #include "content/common/hi_res_timer_manager.h"
-#include "content/common/main_function_params.h"
+#include "content/public/common/main_function_params.h"
 
 // This function provides some ways to test crash and assertion handling
 // behavior of the renderer.
 static void HandleNaClTestParameters(const CommandLine& command_line) {
 // The message box doesn't work in the 64 bit binaries anyways, so no need to
 // link to it since the 64 bit binary doesn't link with chrome or content.
 #if !defined(NACL_WIN64)
   if (command_line.HasSwitch(switches::kNaClStartupDialog)) {
     ChildProcess::WaitForDebugger("NativeClient");
   }
 #endif
 }
 
 // main() routine for the NaCl loader process.
-int NaClMain(const MainFunctionParams& parameters) {
+int NaClMain(const content::MainFunctionParams& parameters) {
   const CommandLine& parsed_command_line = parameters.command_line;
 
   // This function allows pausing execution using the --nacl-startup-dialog
   // flag allowing us to attach a debugger.
   // Do not move this function down since that would mean we can't easily debug
   // whatever occurs before it.
   HandleNaClTestParameters(parsed_command_line);
 
   // The main thread of the plugin services IO.
   MessageLoopForIO main_message_loop;
@@ skipping 26 matching lines @@
     // require waiting for a timeout.
     VLOG(1) << "Sandbox test failed: Not launching NaCl process";
   }
 #else
   NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
 #endif
 
   platform.PlatformUninitialize();
   return 0;
 }