Move browser_test_base.h to content/public/test. I originally thought that content_browsertests wou…

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 "content/public/test/browser_test_base.h"

[Jói, 2012/08/14 16:29:07]

If I understand correctly, the rule is to move the .cc file with the header. 
Shouldn't this file move then?

[jam, 2012/08/14 16:42:22]

content/test didn't obey this. the history is that originally chrome code could
include files from content/test. but then some internal content headers were
leaking through public test headers, so I moved the public ones to
content/public/test.

with your deps improvements, I can now move the cc files to be alongside their
headers,  and enforce that only cc files are including internal headers :) i'll
do that in a followup.

 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/process_util.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "sandbox/win/src/dep.h"
 
 #if defined(OS_MACOSX)
@@ skipping 15 matching lines @@
 static int g_browser_process_pid;
 static void DumpStackTraceSignalHandler(int signal) {
   if (g_browser_process_pid == base::GetCurrentProcId())
     base::debug::StackTrace().PrintBacktrace();
   _exit(128 + signal);
 }
 #endif  // defined(OS_POSIX)
 
 }  // namespace
 
+namespace content {
+
 BrowserTestBase::BrowserTestBase() {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAmIBundled(true);
   base::SystemMonitor::AllocateSystemIOPorts();
 #endif
 
 #if defined(OS_POSIX)
   handle_sigterm_ = true;
 #endif
 }
 
 BrowserTestBase::~BrowserTestBase() {
 }
 
 void BrowserTestBase::SetUp() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
   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));
 
   SetUpInProcessBrowserTestFixture();
   BrowserMain(params);
   TearDownInProcessBrowserTestFixture();
 }
 
 void BrowserTestBase::TearDown() {
 }
 
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 #if defined(OS_POSIX)
   if (handle_sigterm_) {
     g_browser_process_pid = base::GetCurrentProcId();
     signal(SIGTERM, DumpStackTraceSignalHandler);
   }
 #endif  // defined(OS_POSIX)
   RunTestOnMainThreadLoop();
 }
 
 void BrowserTestBase::CreateTestServer(const char* test_server_base) {
   CHECK(!test_server_.get());
   test_server_.reset(new net::TestServer(
       net::TestServer::TYPE_HTTP,
       net::TestServer::kLocalhost,
       FilePath().AppendASCII(test_server_base)));
 }
+
+}  // namespace content