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

chrome/browser/chrome_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 "chrome/browser/chrome_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 184 matching lines @@
   }
 
   return PRIV_EXTENSION;
 }
 
 }  // namespace
 
 namespace chrome {
 
 void ChromeContentBrowserClient::CreateBrowserMainParts(
-    const MainFunctionParams& parameters,
+    const content::MainFunctionParams& parameters,
     std::vector<content::BrowserMainParts*>* parts_list) {
   // Construct the Main browser parts based on the OS type.
 #if defined(OS_WIN)
   parts_list->push_back(new ChromeBrowserMainPartsWin(parameters));
 #elif defined(OS_MACOSX)
   parts_list->push_back(new ChromeBrowserMainPartsMac(parameters));
 #elif defined(OS_CHROMEOS)
   parts_list->push_back(new ChromeBrowserMainPartsChromeos(parameters));
 #elif defined(OS_LINUX)
   parts_list->push_back(new ChromeBrowserMainPartsLinux(parameters));
@@ skipping 772 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome