Chromium Code Reviews| 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" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 #include "chrome/test/base/chrome_process_util.h" | 22 #include "chrome/test/base/chrome_process_util.h" |
| 23 #include "chrome/test/base/test_launcher_utils.h" | 23 #include "chrome/test/base/test_launcher_utils.h" |
| 24 #include "chrome/test/base/test_switches.h" | 24 #include "chrome/test/base/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 "ipc/ipc_channel.h" | 28 #include "ipc/ipc_channel.h" |
| 29 #include "ipc/ipc_descriptors.h" | 29 #include "ipc/ipc_descriptors.h" |
| 30 #include "sql/connection.h" | 30 #include "sql/connection.h" |
| 31 | 31 |
| 32 #if defined(OS_OPENBSD) | |
|
Mark Mentovai
2011/10/26 23:24:28
This file uses kill() and SIGTERM on OS_POSIX. Thi
Robert Nagy
2011/10/31 15:38:38
Done.
| |
| 33 #include <signal.h> | |
| 34 #endif | |
| 35 | |
| 32 namespace { | 36 namespace { |
| 33 | 37 |
| 34 // Passed as value of kTestType. | 38 // Passed as value of kTestType. |
| 35 const char kUITestType[] = "ui"; | 39 const char kUITestType[] = "ui"; |
| 36 | 40 |
| 37 // We want to have a current history database when we start the browser so | 41 // We want to have a current history database when we start the browser so |
| 38 // things like the NTP will have thumbnails. This method updates the dates | 42 // things like the NTP will have thumbnails. This method updates the dates |
| 39 // in the history to be more recent. | 43 // in the history to be more recent. |
| 40 void UpdateHistoryDates(const FilePath& user_data_dir) { | 44 void UpdateHistoryDates(const FilePath& user_data_dir) { |
| 41 // Migrate the times in the segment_usage table to yesterday so we get | 45 // Migrate the times in the segment_usage table to yesterday so we get |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 598 return LaunchBrowserAndServer(state, wait_for_initial_loads); | 602 return LaunchBrowserAndServer(state, wait_for_initial_loads); |
| 599 } | 603 } |
| 600 | 604 |
| 601 void AnonymousProxyLauncher::TerminateConnection() { | 605 void AnonymousProxyLauncher::TerminateConnection() { |
| 602 CloseBrowserAndServer(); | 606 CloseBrowserAndServer(); |
| 603 } | 607 } |
| 604 | 608 |
| 605 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 609 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
| 606 return channel_id_; | 610 return channel_id_; |
| 607 } | 611 } |
| OLD | NEW |