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

Side by Side Diff: media/test/run_all_unittests.cc

Issue 2656523002: Rename media_resources -> localized_strings (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « media/remoting/interstitial.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/test/launcher/unit_test_launcher.h" 7 #include "base/test/launcher/unit_test_launcher.h"
8 #include "base/test/test_discardable_memory_allocator.h" 8 #include "base/test/test_discardable_memory_allocator.h"
9 #include "base/test/test_suite.h" 9 #include "base/test/test_suite.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "media/base/fake_media_resources.h" 11 #include "media/base/fake_localized_strings.h"
12 #include "media/base/media.h" 12 #include "media/base/media.h"
13 #include "media/base/media_switches.h" 13 #include "media/base/media_switches.h"
14 #include "mojo/edk/embedder/embedder.h" 14 #include "mojo/edk/embedder/embedder.h"
15 15
16 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
17 #include "base/android/jni_android.h" 17 #include "base/android/jni_android.h"
18 #include "media/base/android/media_codec_util.h" 18 #include "media/base/android/media_codec_util.h"
19 #include "media/base/android/media_jni_registrar.h" 19 #include "media/base/android/media_jni_registrar.h"
20 #include "ui/gl/android/gl_jni_registrar.h" 20 #include "ui/gl/android/gl_jni_registrar.h"
21 #endif 21 #endif
(...skipping 25 matching lines...) Expand all
47 47
48 media::RegisterJni(env); 48 media::RegisterJni(env);
49 49
50 if (media::MediaCodecUtil::IsMediaCodecAvailable()) 50 if (media::MediaCodecUtil::IsMediaCodecAvailable())
51 media::EnablePlatformDecoderSupport(); 51 media::EnablePlatformDecoderSupport();
52 #endif 52 #endif
53 53
54 // Run this here instead of main() to ensure an AtExitManager is already 54 // Run this here instead of main() to ensure an AtExitManager is already
55 // present. 55 // present.
56 media::InitializeMediaLibrary(); 56 media::InitializeMediaLibrary();
57 media::SetUpFakeMediaResources(); 57 media::SetUpFakeLocalizedStrings();
58 58
59 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); 59 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
60 } 60 }
61 61
62 int main(int argc, char** argv) { 62 int main(int argc, char** argv) {
63 mojo::edk::Init(); 63 mojo::edk::Init();
64 TestSuiteNoAtExit test_suite(argc, argv); 64 TestSuiteNoAtExit test_suite(argc, argv);
65 65
66 return base::LaunchUnitTests( 66 return base::LaunchUnitTests(
67 argc, argv, 67 argc, argv,
68 base::Bind(&TestSuiteNoAtExit::Run, base::Unretained(&test_suite))); 68 base::Bind(&TestSuiteNoAtExit::Run, base::Unretained(&test_suite)));
69 } 69 }
OLDNEW
« no previous file with comments | « media/remoting/interstitial.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698