| Index: content/test/browser_test_base.cc
|
| ===================================================================
|
| --- content/test/browser_test_base.cc (revision 151480)
|
| +++ content/test/browser_test_base.cc (working copy)
|
| @@ -2,7 +2,7 @@
|
| // 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 "content/public/test/browser_test_base.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| @@ -38,6 +38,8 @@
|
|
|
| } // namespace
|
|
|
| +namespace content {
|
| +
|
| BrowserTestBase::BrowserTestBase() {
|
| #if defined(OS_MACOSX)
|
| base::mac::SetOverrideAmIBundled(true);
|
| @@ -60,7 +62,7 @@
|
|
|
| command_line->AppendSwitch(switches::kDomAutomationController);
|
|
|
| - content::MainFunctionParams params(*command_line);
|
| + MainFunctionParams params(*command_line);
|
| params.ui_task =
|
| new base::Closure(
|
| base::Bind(&BrowserTestBase::ProxyRunTestOnMainThreadLoop, this));
|
| @@ -90,3 +92,5 @@
|
| net::TestServer::kLocalhost,
|
| FilePath().AppendASCII(test_server_base)));
|
| }
|
| +
|
| +} // namespace content
|
|
|