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

chrome/service/service_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/debug/debugger.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/service/service_process.h"
-#include "content/common/main_function_params.h"
+#include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "content/common/sandbox_policy.h"
 #include "sandbox/src/sandbox_types.h"
 #elif defined(OS_MACOSX)
 #include "chrome/service/chrome_service_application_mac.h"
 #endif  // defined(OS_WIN)
 
 // Mainline routine for running as the service process.
-int ServiceProcessMain(const MainFunctionParams& parameters) {
+int ServiceProcessMain(const content::MainFunctionParams& parameters) {
   MessageLoopForUI main_message_loop;
   main_message_loop.set_thread_name("MainThread");
   if (parameters.command_line.HasSwitch(switches::kWaitForDebugger)) {
     base::debug::WaitForDebugger(60, true);
   }
 
   VLOG(1) << "Service process launched: "
           << parameters.command_line.GetCommandLineString();
 
 #if defined(OS_MACOSX)
@@ skipping 18 matching lines @@
   if (service_process.Initialize(&main_message_loop,
                                  parameters.command_line,
                                  state.release())) {
     MessageLoop::current()->Run();
   } else {
     LOG(ERROR) << "Service process failed to initialize";
   }
   service_process.Teardown();
   return 0;
 }