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

Side by Side Diff: chrome/test/base/chrome_process_util.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/base/chrome_process_util.h ('k') | chrome/test/base/chrome_process_util_mac.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/base/chrome_process_util.h" 5 #include "chrome/test/base/chrome_process_util.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/process_util.h" 12 #include "base/process/kill.h"
13 #include "base/process/process_iterator.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "chrome/common/chrome_constants.h" 15 #include "chrome/common/chrome_constants.h"
15 #include "chrome/test/base/test_switches.h" 16 #include "chrome/test/base/test_switches.h"
16 #include "content/public/common/result_codes.h" 17 #include "content/public/common/result_codes.h"
17 18
18 using base::TimeDelta; 19 using base::TimeDelta;
19 using base::TimeTicks; 20 using base::TimeTicks;
20 21
21 namespace { 22 namespace {
22 23
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 base::ProcessHandle process) { 158 base::ProcessHandle process) {
158 #if !defined(OS_MACOSX) 159 #if !defined(OS_MACOSX)
159 process_metrics_.reset( 160 process_metrics_.reset(
160 base::ProcessMetrics::CreateProcessMetrics(process)); 161 base::ProcessMetrics::CreateProcessMetrics(process));
161 #else 162 #else
162 process_metrics_.reset( 163 process_metrics_.reset(
163 base::ProcessMetrics::CreateProcessMetrics(process, NULL)); 164 base::ProcessMetrics::CreateProcessMetrics(process, NULL));
164 #endif 165 #endif
165 process_handle_ = process; 166 process_handle_ = process;
166 } 167 }
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_process_util.h ('k') | chrome/test/base/chrome_process_util_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698