| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/public/test/browser_test_base.h" | 5 #include "content/public/test/browser_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/stack_trace.h" | 9 #include "base/debug/stack_trace.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() { | 77 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() { |
| 78 #if defined(OS_POSIX) | 78 #if defined(OS_POSIX) |
| 79 if (handle_sigterm_) { | 79 if (handle_sigterm_) { |
| 80 g_browser_process_pid = base::GetCurrentProcId(); | 80 g_browser_process_pid = base::GetCurrentProcId(); |
| 81 signal(SIGTERM, DumpStackTraceSignalHandler); | 81 signal(SIGTERM, DumpStackTraceSignalHandler); |
| 82 } | 82 } |
| 83 #endif // defined(OS_POSIX) | 83 #endif // defined(OS_POSIX) |
| 84 RunTestOnMainThreadLoop(); | 84 RunTestOnMainThreadLoop(); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void BrowserTestBase::CreateTestServer(const char* test_server_base) { | 87 void BrowserTestBase::CreateTestServer(const FilePath& test_server_base) { |
| 88 CHECK(!test_server_.get()); | 88 CHECK(!test_server_.get()); |
| 89 test_server_.reset(new net::TestServer( | 89 test_server_.reset(new net::TestServer( |
| 90 net::TestServer::TYPE_HTTP, | 90 net::TestServer::TYPE_HTTP, |
| 91 net::TestServer::kLocalhost, | 91 net::TestServer::kLocalhost, |
| 92 FilePath().AppendASCII(test_server_base))); | 92 test_server_base)); |
| 93 } | 93 } |
| 94 | 94 |
| 95 } // namespace content | 95 } // namespace content |
| OLD | NEW |