chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.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/browser/media_galleries/fileapi/media_file_validator_browsertest.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/browser/media_galleries/fileapi/itunes_file_util_unittest.cc ('k') | chrome/browser/media_galleries/fileapi/native_media_file_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/bind.h"	6 #include "base/bind.h"

7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

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

9 #include "base/files/scoped_temp_dir.h"	9 #include "base/files/scoped_temp_dir.h"

10 #include "base/message_loop/message_loop.h"	10 #include "base/message_loop/message_loop.h"

11 #include "base/message_loop/message_loop_proxy.h"	11 #include "base/message_loop/message_loop_proxy.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"	13 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"

14 #include "chrome/test/base/in_process_browser_test.h"	14 #include "chrome/test/base/in_process_browser_test.h"

15 #include "content/public/test/browser_test.h"	15 #include "content/public/test/browser_test.h"

16 #include "content/public/test/test_file_system_backend.h"	16 #include "content/public/test/test_file_system_backend.h"

17 #include "content/public/test/test_file_system_context.h"	17 #include "content/public/test/test_file_system_context.h"

18 #include "content/public/test/test_utils.h"	18 #include "content/public/test/test_utils.h"

(...skipping 257 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
276 test_file = test_file.AppendASCII("no_streams.webm");	276 test_file = test_file.AppendASCII("no_streams.webm");

277 MoveTestFromFile("no_streams.webm", test_file, false);	277 MoveTestFromFile("no_streams.webm", test_file, false);

278 }	278 }

279	279

280 IN_PROC_BROWSER_TEST_F(MediaFileValidatorTest, ValidVideo) {	280 IN_PROC_BROWSER_TEST_F(MediaFileValidatorTest, ValidVideo) {

281 base::FilePath test_file = GetMediaTestDir();	281 base::FilePath test_file = GetMediaTestDir();

282 ASSERT_FALSE(test_file.empty());	282 ASSERT_FALSE(test_file.empty());

283 test_file = test_file.AppendASCII("bear-320x240-multitrack.webm");	283 test_file = test_file.AppendASCII("bear-320x240-multitrack.webm");

284 MoveTestFromFile("multitrack.webm", test_file, true);	284 MoveTestFromFile("multitrack.webm", test_file, true);

285 }	285 }

OLD	NEW