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

content/test/browser_test_base.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/test/browser_test_base.h"
 
 #include "base/command_line.h"
 #include "base/task.h"
-#include "content/common/main_function_params.h"
+#include "content/public/common/main_function_params.h"
 #include "sandbox/src/dep.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/system_monitor/system_monitor.h"
 #endif
 
-extern int BrowserMain(const MainFunctionParams&);
+extern int BrowserMain(const content::MainFunctionParams&);
 
 BrowserTestBase::BrowserTestBase() {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
   base::SystemMonitor::AllocateSystemIOPorts();
 #endif
 }
 
 BrowserTestBase::~BrowserTestBase() {
 }
 
 void BrowserTestBase::SetUp() {
-  MainFunctionParams params(*CommandLine::ForCurrentProcess());
+  content::MainFunctionParams params(*CommandLine::ForCurrentProcess());
   params.ui_task =
       NewRunnableMethod(this, &BrowserTestBase::ProxyRunTestOnMainThreadLoop);
 
   SetUpInProcessBrowserTestFixture();
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }
 
 void BrowserTestBase::TearDown() {
 }
 
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
   RunTestOnMainThreadLoop();
 }