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

content/shell/shell_main_delegate.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 "content/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_plugin_client.h"
@@ skipping 17 matching lines @@
 
   content::SetContentClient(&content_client_);
   InitializeShellContentClient(process_type);
 }
 
 void ShellMainDelegate::SandboxInitialized(const std::string& process_type) {
 }
 
 int ShellMainDelegate::RunProcess(
     const std::string& process_type,
-    const MainFunctionParams& main_function_params) {
+    const content::MainFunctionParams& main_function_params) {
   NOTREACHED();
   return -1;
 }
 
 void ShellMainDelegate::ProcessExiting(const std::string& process_type) {
 }
 
 #if defined(OS_MACOSX)
 bool ShellMainDelegate::ProcessRegistersWithSystemProcess(
     const std::string& process_type) {
@@ skipping 31 matching lines @@
     renderer_client_.reset(new content::ShellContentRendererClient);
     content::GetContentClient()->set_renderer(renderer_client_.get());
   } else if (process_type == switches::kPluginProcess) {
     plugin_client_.reset(new content::ShellContentPluginClient);
     content::GetContentClient()->set_plugin(plugin_client_.get());
   } else if (process_type == switches::kUtilityProcess) {
     utility_client_.reset(new content::ShellContentUtilityClient);
     content::GetContentClient()->set_utility(utility_client_.get());
   }
 }