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 "chrome/test/automation/proxy_launcher.h" | 5 #include "chrome/test/automation/proxy_launcher.h" |
6 | 6 |
7 #include "base/environment.h" | 7 #include "base/environment.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/string_split.h" | 10 #include "base/string_split.h" |
11 #include "base/stringprintf.h" | 11 #include "base/stringprintf.h" |
12 #include "base/test/test_file_util.h" | 12 #include "base/test/test_file_util.h" |
13 #include "base/test/test_timeouts.h" | 13 #include "base/test/test_timeouts.h" |
14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/common/automation_constants.h" | 16 #include "chrome/common/automation_constants.h" |
17 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/logging_chrome.h" | 19 #include "chrome/common/logging_chrome.h" |
20 #include "chrome/common/url_constants.h" | 20 #include "chrome/common/url_constants.h" |
21 #include "chrome/test/automation/automation_proxy.h" | 21 #include "chrome/test/automation/automation_proxy.h" |
| 22 #include "chrome/test/base/test_launcher_utils.h" |
22 #include "chrome/test/chrome_process_util.h" | 23 #include "chrome/test/chrome_process_util.h" |
23 #include "chrome/test/test_launcher_utils.h" | |
24 #include "chrome/test/test_switches.h" | 24 #include "chrome/test/test_switches.h" |
25 #include "chrome/test/ui/ui_test.h" | 25 #include "chrome/test/ui/ui_test.h" |
26 #include "content/common/child_process_info.h" | 26 #include "content/common/child_process_info.h" |
27 #include "content/common/debug_flags.h" | 27 #include "content/common/debug_flags.h" |
28 #include "content/common/result_codes.h" | 28 #include "content/common/result_codes.h" |
29 #include "sql/connection.h" | 29 #include "sql/connection.h" |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 // Passed as value of kTestType. | 33 // Passed as value of kTestType. |
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 return LaunchBrowserAndServer(state, wait_for_initial_loads); | 598 return LaunchBrowserAndServer(state, wait_for_initial_loads); |
599 } | 599 } |
600 | 600 |
601 void AnonymousProxyLauncher::TerminateConnection() { | 601 void AnonymousProxyLauncher::TerminateConnection() { |
602 CloseBrowserAndServer(); | 602 CloseBrowserAndServer(); |
603 } | 603 } |
604 | 604 |
605 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 605 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
606 return channel_id_; | 606 return channel_id_; |
607 } | 607 } |
OLD | NEW |