| 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" |
| 11 #include "content/public/common/content_switches.h" | 11 #include "content/public/common/content_switches.h" |
| 12 #include "content/public/common/main_function_params.h" | 12 #include "content/public/common/main_function_params.h" |
| 13 #include "sandbox/win/src/dep.h" | |
| 14 | 13 |
| 15 #if defined(OS_MACOSX) | 14 #if defined(OS_MACOSX) |
| 16 #include "base/mac/mac_util.h" | 15 #include "base/mac/mac_util.h" |
| 17 #include "base/system_monitor/system_monitor.h" | 16 #include "base/system_monitor/system_monitor.h" |
| 18 #endif | 17 #endif |
| 19 | 18 |
| 20 extern int BrowserMain(const content::MainFunctionParams&); | 19 extern int BrowserMain(const content::MainFunctionParams&); |
| 21 | 20 |
| 22 namespace { | 21 namespace { |
| 23 | 22 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 86 |
| 88 void BrowserTestBase::CreateTestServer(const char* test_server_base) { | 87 void BrowserTestBase::CreateTestServer(const char* test_server_base) { |
| 89 CHECK(!test_server_.get()); | 88 CHECK(!test_server_.get()); |
| 90 test_server_.reset(new net::TestServer( | 89 test_server_.reset(new net::TestServer( |
| 91 net::TestServer::TYPE_HTTP, | 90 net::TestServer::TYPE_HTTP, |
| 92 net::TestServer::kLocalhost, | 91 net::TestServer::kLocalhost, |
| 93 FilePath().AppendASCII(test_server_base))); | 92 FilePath().AppendASCII(test_server_base))); |
| 94 } | 93 } |
| 95 | 94 |
| 96 } // namespace content | 95 } // namespace content |
| OLD | NEW |