chrome/test/base/chrome_test_launcher.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/test/base/chrome_test_launcher.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 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

« no previous file with comments | « chrome/service/service_utility_process_host.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | no next file with comments »

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/base/chrome_test_launcher.h"	5 #include "chrome/test/base/chrome_test_launcher.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/debug/leak_annotations.h"	8 #include "base/debug/leak_annotations.h"

9 #include "base/file_util.h"

10 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

	10 #include "base/files/file_util.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/memory/linked_ptr.h"	12 #include "base/memory/linked_ptr.h"

13 #include "base/process/process_metrics.h"	13 #include "base/process/process_metrics.h"

14 #include "base/run_loop.h"	14 #include "base/run_loop.h"

15 #include "base/strings/string_util.h"	15 #include "base/strings/string_util.h"

16 #include "base/test/test_file_util.h"	16 #include "base/test/test_file_util.h"

17 #include "chrome/app/chrome_main_delegate.h"	17 #include "chrome/app/chrome_main_delegate.h"

18 #include "chrome/common/chrome_constants.h"	18 #include "chrome/common/chrome_constants.h"

19 #include "chrome/common/chrome_switches.h"	19 #include "chrome/common/chrome_switches.h"

20 #include "chrome/test/base/chrome_test_suite.h"	20 #include "chrome/test/base/chrome_test_suite.h"

(...skipping 95 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116 // all other code.	116 // all other code.

117 chrome::ChromeBreakpadClient* breakpad_client =	117 chrome::ChromeBreakpadClient* breakpad_client =

118 new chrome::ChromeBreakpadClient();	118 new chrome::ChromeBreakpadClient();

119 ANNOTATE_LEAKING_OBJECT_PTR(breakpad_client);	119 ANNOTATE_LEAKING_OBJECT_PTR(breakpad_client);

120 breakpad::SetBreakpadClient(breakpad_client);	120 breakpad::SetBreakpadClient(breakpad_client);

121 #endif	121 #endif

122	122

123 ChromeTestLauncherDelegate launcher_delegate(runner);	123 ChromeTestLauncherDelegate launcher_delegate(runner);

124 return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv);	124 return content::LaunchTests(&launcher_delegate, default_jobs, argc, argv);

125 }	125 }

OLD	NEW