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

Side by Side Diff: media/base/test_data_util.h

Issue 357413002: Have media content and chrome browser tests load data from media/test/data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: few merge fixes Created 6 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
OLDNEW
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 #ifndef MEDIA_BASE_TEST_DATA_UTIL_H_ 5 #ifndef MEDIA_BASE_TEST_DATA_UTIL_H_
6 #define MEDIA_BASE_TEST_DATA_UTIL_H_ 6 #define MEDIA_BASE_TEST_DATA_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 14
15 namespace media { 15 namespace media {
16 16
17 class DecoderBuffer; 17 class DecoderBuffer;
18 18
19 // Returns a file path for a file in the media/test/data directory. 19 // Returns a file path for a file in the media/test/data directory.
20 base::FilePath GetTestDataFilePath(const std::string& name); 20 base::FilePath GetTestDataFilePath(const std::string& name);
21 21
22 // Returns relative path for test data folder: media/test/data.
23 base::FilePath GetTestDataPath();
24
22 // Reads a test file from media/test/data directory and stores it in 25 // Reads a test file from media/test/data directory and stores it in
23 // a DecoderBuffer. Use DecoderBuffer vs DataBuffer to ensure no matter 26 // a DecoderBuffer. Use DecoderBuffer vs DataBuffer to ensure no matter
24 // what a test does, it's safe to use FFmpeg methods. 27 // what a test does, it's safe to use FFmpeg methods.
25 // 28 //
26 // |name| - The name of the file. 29 // |name| - The name of the file.
27 // |buffer| - The contents of the file. 30 // |buffer| - The contents of the file.
28 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name); 31 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name);
29 32
30 } // namespace media 33 } // namespace media
31 34
32 #endif // MEDIA_BASE_TEST_DATA_UTIL_H_ 35 #endif // MEDIA_BASE_TEST_DATA_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698