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

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

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 3 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
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/path_service.h" 13 #include "base/path_service.h"
13 #include "base/process_util.h" 14 #include "base/process_util.h"
14 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/env_vars.h" 16 #include "chrome/common/env_vars.h"
16 17
17 UITestSuite::UITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) { 18 UITestSuite::UITestSuite(int argc, char** argv) : ChromeTestSuite(argc, argv) {
18 #if defined(OS_WIN) 19 #if defined(OS_WIN)
19 crash_service_ = NULL; 20 crash_service_ = NULL;
20 #endif 21 #endif
21 } 22 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 54
54 FilePath crash_service = exe_dir.Append(L"crash_service.exe"); 55 FilePath crash_service = exe_dir.Append(L"crash_service.exe");
55 if (!base::LaunchProcess(crash_service.value(), base::LaunchOptions(), 56 if (!base::LaunchProcess(crash_service.value(), base::LaunchOptions(),
56 &crash_service_)) { 57 &crash_service_)) {
57 LOG(ERROR) << "Couldn't start crash_service.exe, so this ui_tests run " 58 LOG(ERROR) << "Couldn't start crash_service.exe, so this ui_tests run "
58 << "won't tell you if any test crashes!"; 59 << "won't tell you if any test crashes!";
59 return; 60 return;
60 } 61 }
61 } 62 }
62 #endif 63 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698