Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Side by Side Diff: chrome/test/ui/ui_test_suite.cc

Issue 19860007: Update include paths in chrome/test for base/process changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: '' Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui/ui_test_suite.h ('k') | chrome/test/webdriver/webdriver_session.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ui/ui_test_suite.h" 5 #include "chrome/test/ui/ui_test_suite.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/process_util.h" 14 #include "base/process/kill.h"
15 #include "base/process/launch.h"
16 #include "base/process/process_iterator.h"
15 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/env_vars.h" 18 #include "chrome/common/env_vars.h"
17 19
18 UITestSuite::UITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) { 20 UITestSuite::UITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {
19 #if defined(OS_WIN) 21 #if defined(OS_WIN)
20 crash_service_ = NULL; 22 crash_service_ = NULL;
21 #endif 23 #endif
22 } 24 }
23 25
24 void UITestSuite::Initialize() { 26 void UITestSuite::Initialize() {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 launch_options.job_handle = job_handle_.Get(); 70 launch_options.job_handle = job_handle_.Get();
69 base::FilePath crash_service = exe_dir.Append(L"crash_service.exe"); 71 base::FilePath crash_service = exe_dir.Append(L"crash_service.exe");
70 if (!base::LaunchProcess(crash_service.value(), base::LaunchOptions(), 72 if (!base::LaunchProcess(crash_service.value(), base::LaunchOptions(),
71 &crash_service_)) { 73 &crash_service_)) {
72 LOG(ERROR) << "Couldn't start crash_service.exe, so this ui_tests run " 74 LOG(ERROR) << "Couldn't start crash_service.exe, so this ui_tests run "
73 << "won't tell you if any test crashes!"; 75 << "won't tell you if any test crashes!";
74 return; 76 return;
75 } 77 }
76 } 78 }
77 #endif 79 #endif
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_test_suite.h ('k') | chrome/test/webdriver/webdriver_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698