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

content/shell/shell_content_browser_client.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.
 
 #ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
 #include <string>
 
@@ skipping 16 matching lines @@
 {
  public:
   ShellContentBrowserClient();
   virtual ~ShellContentBrowserClient();
 
   void set_shell_browser_main_parts(ShellBrowserMainParts* parts) {
     shell_browser_main_parts_ = parts;
   }
 
   virtual void CreateBrowserMainParts(
-      const MainFunctionParams& parameters,
+      const content::MainFunctionParams& parameters,
       std::vector<BrowserMainParts*>* parts_list) OVERRIDE;
   virtual RenderWidgetHostView* CreateViewForWidget(
       RenderWidgetHost* widget) OVERRIDE;
   virtual TabContentsView* CreateTabContentsView(
       TabContents* tab_contents) OVERRIDE;
   virtual void RenderViewHostCreated(
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void BrowserRenderProcessHostCreated(
       BrowserRenderProcessHost* host) OVERRIDE;
   virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE;
@@ skipping 118 matching lines @@
       const ViewHostMsg_CreateWindow_Params& params) OVERRIDE;
 #endif
 
  private:
   ShellBrowserMainParts* shell_browser_main_parts_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_