media/filters/ffmpeg_demuxer_unittest.cc - Issue 14820034: Cleanup: Remove unneeded base/file_util.h includes in chrome_frame, courgette, ipc, media, and net.

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: media/filters/ffmpeg_demuxer_unittest.cc

Issue 14820034: Cleanup: Remove unneeded base/file_util.h includes in chrome_frame, courgette, ipc, media, and net. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: fix build Created 7 years, 7 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

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 <algorithm>	5 #include <algorithm>

6 #include <deque>	6 #include <deque>

7 #include <string>	7 #include <string>

8	8

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

10 #include "base/file_util.h"

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

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

13 #include "base/threading/thread.h"	12 #include "base/threading/thread.h"

14 #include "media/base/decrypt_config.h"	13 #include "media/base/decrypt_config.h"

15 #include "media/base/mock_demuxer_host.h"	14 #include "media/base/mock_demuxer_host.h"

16 #include "media/base/test_helpers.h"	15 #include "media/base/test_helpers.h"

17 #include "media/ffmpeg/ffmpeg_common.h"	16 #include "media/ffmpeg/ffmpeg_common.h"

18 #include "media/filters/ffmpeg_demuxer.h"	17 #include "media/filters/ffmpeg_demuxer.h"

19 #include "media/filters/file_data_source.h"	18 #include "media/filters/file_data_source.h"

20 #include "media/webm/webm_crypto_helpers.h"	19 #include "media/webm/webm_crypto_helpers.h"

(...skipping 549 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
570 TEST_F(FFmpegDemuxerTest, MP4_ZeroStszEntry) {	569 TEST_F(FFmpegDemuxerTest, MP4_ZeroStszEntry) {

571 #if !defined(USE_PROPRIETARY_CODECS)	570 #if !defined(USE_PROPRIETARY_CODECS)

572 return;	571 return;

573 #endif	572 #endif

574 CreateDemuxer("bear-1280x720-zero-stsz-entry.mp4");	573 CreateDemuxer("bear-1280x720-zero-stsz-entry.mp4");

575 InitializeDemuxer();	574 InitializeDemuxer();

576 ReadUntilEndOfStream();	575 ReadUntilEndOfStream();

577 }	576 }

578	577

579 } // namespace media	578 } // namespace media

OLD	NEW

« no previous file with comments | « media/filters/blocking_url_protocol_unittest.cc ('k') | net/base/sdch_filter.cc » ('j') | no next file with comments »