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/ui_test_utils.h" | 5 #include "chrome/test/ui_test_utils.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
| 9 #include "base/command_line.h" |
9 #include "base/file_path.h" | 10 #include "base/file_path.h" |
10 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
11 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
12 #include "base/path_service.h" | 13 #include "base/path_service.h" |
13 #include "base/process_util.h" | 14 #include "base/process_util.h" |
14 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
15 #include "base/values.h" | 16 #include "base/values.h" |
16 #include "chrome/browser/browser.h" | 17 #include "chrome/browser/browser.h" |
17 #include "chrome/browser/browser_list.h" | 18 #include "chrome/browser/browser_list.h" |
18 #include "chrome/browser/dom_operation_notification_details.h" | 19 #include "chrome/browser/dom_operation_notification_details.h" |
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
659 TestWebSocketServer::~TestWebSocketServer() { | 660 TestWebSocketServer::~TestWebSocketServer() { |
660 scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine()); | 661 scoped_ptr<CommandLine> cmd_line(CreateWebSocketServerCommandLine()); |
661 cmd_line->AppendSwitchWithValue("server", "stop"); | 662 cmd_line->AppendSwitchWithValue("server", "stop"); |
662 cmd_line->AppendSwitch("chromium"); | 663 cmd_line->AppendSwitch("chromium"); |
663 cmd_line->AppendSwitchWithValue("pidfile", | 664 cmd_line->AppendSwitchWithValue("pidfile", |
664 websocket_pid_file_.ToWStringHack()); | 665 websocket_pid_file_.ToWStringHack()); |
665 base::LaunchApp(*cmd_line.get(), true, false, NULL); | 666 base::LaunchApp(*cmd_line.get(), true, false, NULL); |
666 } | 667 } |
667 | 668 |
668 } // namespace ui_test_utils | 669 } // namespace ui_test_utils |
OLD | NEW |