OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
11 #include "base/files/file_enumerator.h" | 11 #include "base/files/file_enumerator.h" |
12 #include "base/files/scoped_file.h" | |
13 #include "base/process/kill.h" | 12 #include "base/process/kill.h" |
14 #include "base/process/launch.h" | 13 #include "base/process/launch.h" |
15 #include "base/strings/string_number_conversions.h" | 14 #include "base/strings/string_number_conversions.h" |
16 #include "base/strings/string_split.h" | 15 #include "base/strings/string_split.h" |
17 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
18 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
19 #include "base/test/test_file_util.h" | 18 #include "base/test/test_file_util.h" |
20 #include "base/test/test_timeouts.h" | 19 #include "base/test/test_timeouts.h" |
21 #include "chrome/app/chrome_command_ids.h" | 20 #include "chrome/app/chrome_command_ids.h" |
22 #include "chrome/common/automation_constants.h" | 21 #include "chrome/common/automation_constants.h" |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 | 482 |
484 if (main_launch) | 483 if (main_launch) |
485 browser_launch_time_ = base::TimeTicks::Now(); | 484 browser_launch_time_ = base::TimeTicks::Now(); |
486 | 485 |
487 base::LaunchOptions options; | 486 base::LaunchOptions options; |
488 options.wait = wait; | 487 options.wait = wait; |
489 | 488 |
490 #if defined(OS_WIN) | 489 #if defined(OS_WIN) |
491 options.start_hidden = !state.show_window; | 490 options.start_hidden = !state.show_window; |
492 #elif defined(OS_POSIX) | 491 #elif defined(OS_POSIX) |
493 base::ScopedFD ipcfd; | 492 int ipcfd = -1; |
| 493 file_util::ScopedFD ipcfd_closer(&ipcfd); |
494 base::FileHandleMappingVector fds; | 494 base::FileHandleMappingVector fds; |
495 if (main_launch && automation_proxy_.get()) { | 495 if (main_launch && automation_proxy_.get()) { |
496 ipcfd.reset(automation_proxy_->channel()->TakeClientFileDescriptor()); | 496 ipcfd = automation_proxy_->channel()->TakeClientFileDescriptor(); |
497 fds.push_back(std::make_pair(ipcfd.get(), | 497 fds.push_back(std::make_pair(ipcfd, |
498 kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); | 498 kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor)); |
499 options.fds_to_remap = &fds; | 499 options.fds_to_remap = &fds; |
500 } | 500 } |
501 #endif | 501 #endif |
502 | 502 |
503 return base::LaunchProcess(command_line, options, process); | 503 return base::LaunchProcess(command_line, options, process); |
504 } | 504 } |
505 | 505 |
506 AutomationProxy* ProxyLauncher::automation() const { | 506 AutomationProxy* ProxyLauncher::automation() const { |
507 EXPECT_TRUE(automation_proxy_.get()); | 507 EXPECT_TRUE(automation_proxy_.get()); |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 return LaunchBrowserAndServer(state, wait_for_initial_loads); | 622 return LaunchBrowserAndServer(state, wait_for_initial_loads); |
623 } | 623 } |
624 | 624 |
625 void AnonymousProxyLauncher::TerminateConnection() { | 625 void AnonymousProxyLauncher::TerminateConnection() { |
626 CloseBrowserAndServer(); | 626 CloseBrowserAndServer(); |
627 } | 627 } |
628 | 628 |
629 std::string AnonymousProxyLauncher::PrefixedChannelID() const { | 629 std::string AnonymousProxyLauncher::PrefixedChannelID() const { |
630 return channel_id_; | 630 return channel_id_; |
631 } | 631 } |
OLD | NEW |