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

content/shell/shell_content_browser_client.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_content_browser_client.h"
 
 #include "base/file_path.h"
 #include "content/browser/webui/empty_web_ui_factory.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_main.h"
@@ skipping 11 matching lines @@
 namespace content {
 
 ShellContentBrowserClient::ShellContentBrowserClient()
     : shell_browser_main_parts_(NULL) {
 }
 
 ShellContentBrowserClient::~ShellContentBrowserClient() {
 }
 
 void ShellContentBrowserClient::CreateBrowserMainParts(
-    const MainFunctionParams& parameters,
+    const content::MainFunctionParams& parameters,
     std::vector<BrowserMainParts*>* parts_list) {
   parts_list->push_back(new ShellBrowserMainParts(parameters));
 }
 
 RenderWidgetHostView* ShellContentBrowserClient::CreateViewForWidget(
     RenderWidgetHost* widget) {
 #if defined(OS_WIN)
   return new RenderWidgetHostViewWin(widget);
 #else
   return NULL;
@@ skipping 276 matching lines @@
       tab_contents_view->tab_contents()->browser_context(),
       GURL(),
       tab_contents_view->tab_contents()->GetSiteInstance(),
       route_id,
       tab_contents_view->tab_contents());
   return shell->tab_contents();
 }
 #endif
 
 }  // namespace content