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 "app/sql/connection.h" | |
8 #include "base/environment.h" | 7 #include "base/environment.h" |
9 #include "base/file_util.h" | 8 #include "base/file_util.h" |
10 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
11 #include "base/string_split.h" | 10 #include "base/string_split.h" |
12 #include "base/stringprintf.h" | 11 #include "base/stringprintf.h" |
13 #include "base/test/test_file_util.h" | 12 #include "base/test/test_file_util.h" |
14 #include "base/test/test_timeouts.h" | 13 #include "base/test/test_timeouts.h" |
15 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
16 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
17 #include "chrome/common/automation_constants.h" | 16 #include "chrome/common/automation_constants.h" |
18 #include "chrome/common/chrome_constants.h" | 17 #include "chrome/common/chrome_constants.h" |
19 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
20 #include "chrome/common/logging_chrome.h" | 19 #include "chrome/common/logging_chrome.h" |
21 #include "chrome/common/url_constants.h" | 20 #include "chrome/common/url_constants.h" |
| 21 #include "chrome/test/automation/automation_proxy.h" |
22 #include "chrome/test/chrome_process_util.h" | 22 #include "chrome/test/chrome_process_util.h" |
23 #include "chrome/test/test_launcher_utils.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/automation/automation_proxy.h" | |
26 #include "chrome/test/ui/ui_test.h" | 25 #include "chrome/test/ui/ui_test.h" |
27 #include "content/common/child_process_info.h" | 26 #include "content/common/child_process_info.h" |
28 #include "content/common/debug_flags.h" | 27 #include "content/common/debug_flags.h" |
| 28 #include "sql/connection.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 // We want to have a current history database when we start the browser so | 35 // We want to have a current history database when we start the browser so |
36 // things like the NTP will have thumbnails. This method updates the dates | 36 // things like the NTP will have thumbnails. This method updates the dates |
37 // in the history to be more recent. | 37 // in the history to be more recent. |
38 void UpdateHistoryDates(const FilePath& user_data_dir) { | 38 void UpdateHistoryDates(const FilePath& user_data_dir) { |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads)); | 576 ASSERT_TRUE(LaunchBrowserAndServer(state, wait_for_initial_loads)); |
577 } | 577 } |
578 | 578 |
579 void AnonymousProxyLauncher::TerminateConnection() { | 579 void AnonymousProxyLauncher::TerminateConnection() { |
580 CloseBrowserAndServer(); | 580 CloseBrowserAndServer(); |
581 } | 581 } |
582 | 582 |
583 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 583 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
584 return channel_id_; | 584 return channel_id_; |
585 } | 585 } |
OLD | NEW |