OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/sql/connection.h" | 7 #include "app/sql/connection.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/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/stringprintf.h" | 12 #include "base/stringprintf.h" |
13 #include "base/test/test_file_util.h" | 13 #include "base/test/test_file_util.h" |
14 #include "base/test/test_timeouts.h" | 14 #include "base/test/test_timeouts.h" |
15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
16 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
17 #include "chrome/common/automation_constants.h" | 17 #include "chrome/common/automation_constants.h" |
18 #include "chrome/common/child_process_info.h" | |
19 #include "chrome/common/chrome_constants.h" | 18 #include "chrome/common/chrome_constants.h" |
20 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
21 #include "chrome/common/debug_flags.h" | 20 #include "chrome/common/debug_flags.h" |
22 #include "chrome/common/logging_chrome.h" | 21 #include "chrome/common/logging_chrome.h" |
23 #include "chrome/common/url_constants.h" | 22 #include "chrome/common/url_constants.h" |
24 #include "chrome/test/chrome_process_util.h" | 23 #include "chrome/test/chrome_process_util.h" |
25 #include "chrome/test/test_launcher_utils.h" | 24 #include "chrome/test/test_launcher_utils.h" |
26 #include "chrome/test/test_switches.h" | 25 #include "chrome/test/test_switches.h" |
27 #include "chrome/test/automation/automation_proxy.h" | 26 #include "chrome/test/automation/automation_proxy.h" |
28 #include "chrome/test/ui/ui_test.h" | 27 #include "chrome/test/ui/ui_test.h" |
| 28 #include "content/common/child_process_info.h" |
29 | 29 |
30 namespace { | 30 namespace { |
31 | 31 |
32 // Passed as value of kTestType. | 32 // Passed as value of kTestType. |
33 const char kUITestType[] = "ui"; | 33 const char kUITestType[] = "ui"; |
34 | 34 |
35 // Rewrite the preferences file to point to the proper image directory. | 35 // Rewrite the preferences file to point to the proper image directory. |
36 void RewritePreferencesFile(const FilePath& user_data_dir) { | 36 void RewritePreferencesFile(const FilePath& user_data_dir) { |
37 const FilePath pref_template_path( | 37 const FilePath pref_template_path( |
38 user_data_dir.AppendASCII("Default").AppendASCII("PreferencesTemplate")); | 38 user_data_dir.AppendASCII("Default").AppendASCII("PreferencesTemplate")); |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 LaunchBrowserAndServer(state, wait_for_initial_loads); | 572 LaunchBrowserAndServer(state, wait_for_initial_loads); |
573 } | 573 } |
574 | 574 |
575 void AnonymousProxyLauncher::TerminateConnection() { | 575 void AnonymousProxyLauncher::TerminateConnection() { |
576 CloseBrowserAndServer(); | 576 CloseBrowserAndServer(); |
577 } | 577 } |
578 | 578 |
579 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 579 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
580 return channel_id_; | 580 return channel_id_; |
581 } | 581 } |
OLD | NEW |