| 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 #ifndef CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ | 5 #ifndef CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ |
| 6 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ | 6 #define CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 } | 159 } |
| 160 | 160 |
| 161 private: | 161 private: |
| 162 bool WaitForBrowserLaunch(bool wait_for_initial_loads) WARN_UNUSED_RESULT; | 162 bool WaitForBrowserLaunch(bool wait_for_initial_loads) WARN_UNUSED_RESULT; |
| 163 | 163 |
| 164 // Prepare command line that will be used to launch the child browser process. | 164 // Prepare command line that will be used to launch the child browser process. |
| 165 void PrepareTestCommandline(CommandLine* command_line, | 165 void PrepareTestCommandline(CommandLine* command_line, |
| 166 bool include_testing_id); | 166 bool include_testing_id); |
| 167 | 167 |
| 168 bool LaunchBrowserHelper(const LaunchState& state, | 168 bool LaunchBrowserHelper(const LaunchState& state, |
| 169 bool main_launch, |
| 169 bool wait, | 170 bool wait, |
| 170 base::ProcessHandle* process) WARN_UNUSED_RESULT; | 171 base::ProcessHandle* process) WARN_UNUSED_RESULT; |
| 171 | 172 |
| 172 scoped_ptr<AutomationProxy> automation_proxy_; | 173 scoped_ptr<AutomationProxy> automation_proxy_; |
| 173 | 174 |
| 174 // We use a temporary directory for profile to avoid issues with being | 175 // We use a temporary directory for profile to avoid issues with being |
| 175 // unable to delete some files because they're in use, etc. | 176 // unable to delete some files because they're in use, etc. |
| 176 ScopedTempDir temp_profile_dir_; | 177 ScopedTempDir temp_profile_dir_; |
| 177 | 178 |
| 178 // Handle to the first Chrome process. | 179 // Handle to the first Chrome process. |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 | 261 |
| 261 protected: | 262 protected: |
| 262 std::string channel_id_; // Channel id of automation proxy. | 263 std::string channel_id_; // Channel id of automation proxy. |
| 263 bool disconnect_on_failure_; // True if we disconnect on IPC channel failure. | 264 bool disconnect_on_failure_; // True if we disconnect on IPC channel failure. |
| 264 | 265 |
| 265 private: | 266 private: |
| 266 DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher); | 267 DISALLOW_COPY_AND_ASSIGN(AnonymousProxyLauncher); |
| 267 }; | 268 }; |
| 268 | 269 |
| 269 #endif // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ | 270 #endif // CHROME_TEST_AUTOMATION_PROXY_LAUNCHER_H_ |
| OLD | NEW |