diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 20:25:18 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-31 20:25:18 +0000 |
| commit | 4573fbd30d7ed70f959efb69b32ad9547465f0ce (patch) | |
| tree | 958d424cf2dfa7b22aba942c8ebc383a5ba22517 /content/test/browser_test_base.cc | |
| parent | 5262dc192af688c4f9301753fa7890975303b909 (diff) | |
| download | chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.zip chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.gz chromium_src-4573fbd30d7ed70f959efb69b32ad9547465f0ce.tar.bz2 | |
Move content_restriction.h and main_function_params.h to content/public/common, and put them in the content namespace.
BUG=98716
Review URL: http://codereview.chromium.org/8387039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/browser_test_base.cc')
| -rw-r--r-- | content/test/browser_test_base.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/test/browser_test_base.cc b/content/test/browser_test_base.cc index d1f89f8..a6a3092 100644 --- a/content/test/browser_test_base.cc +++ b/content/test/browser_test_base.cc @@ -6,7 +6,7 @@ #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) @@ -14,7 +14,7 @@ #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) @@ -27,7 +27,7 @@ BrowserTestBase::~BrowserTestBase() { } void BrowserTestBase::SetUp() { - MainFunctionParams params(*CommandLine::ForCurrentProcess()); + content::MainFunctionParams params(*CommandLine::ForCurrentProcess()); params.ui_task = NewRunnableMethod(this, &BrowserTestBase::ProxyRunTestOnMainThreadLoop); |