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

Side by Side Diff: media/base/media_file_checker_unittest.cc

Issue 23205006: Define proprietary_codecs=1 when branding==Chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase onto lkgr Created 7 years, 4 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 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/logging.h" 5 #include "base/logging.h"
6 #include "build/build_config.h" 6 #include "build/build_config.h"
7 #include "media/base/media_file_checker.h" 7 #include "media/base/media_file_checker.h"
8 #include "media/base/test_data_util.h" 8 #include "media/base/test_data_util.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 21 matching lines...) Expand all
32 } 32 }
33 33
34 TEST(MediaFileCheckerTest, Video) { 34 TEST(MediaFileCheckerTest, Video) {
35 RunMediaFileChecker("bear.ogv", true); 35 RunMediaFileChecker("bear.ogv", true);
36 } 36 }
37 37
38 TEST(MediaFileCheckerTest, Audio) { 38 TEST(MediaFileCheckerTest, Audio) {
39 RunMediaFileChecker("sfx.ogg", true); 39 RunMediaFileChecker("sfx.ogg", true);
40 } 40 }
41 41
42 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) 42 #if defined(USE_PROPRIETARY_CODECS)
43 TEST(MediaFileCheckerTest, MP3) { 43 TEST(MediaFileCheckerTest, MP3) {
44 RunMediaFileChecker("sfx.mp3", true); 44 RunMediaFileChecker("sfx.mp3", true);
45 } 45 }
46 #endif 46 #endif
47 47
48 } // namespace media 48 } // namespace media
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/key_systems_unittest.cc ('k') | media/filters/audio_file_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698