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 "content/public/test/content_test_suite_base.h" | 5 #include "content/public/test/content_test_suite_base.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/test/test_suite.h" | 10 #include "base/test/test_suite.h" |
11 #include "content/common/url_schemes.h" | 11 #include "content/common/url_schemes.h" |
12 #include "content/public/common/content_client.h" | 12 #include "content/public/common/content_client.h" |
13 #include "content/public/common/content_paths.h" | 13 #include "content/public/common/content_paths.h" |
| 14 #include "media/base/media.h" |
14 #include "ui/base/ui_base_paths.h" | 15 #include "ui/base/ui_base_paths.h" |
15 #include "ui/compositor/compositor_setup.h" | 16 #include "ui/compositor/compositor_setup.h" |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 | 19 |
19 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv) | 20 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv) |
20 : base::TestSuite(argc, argv) { | 21 : base::TestSuite(argc, argv) { |
21 } | 22 } |
22 | 23 |
23 void ContentTestSuiteBase::Initialize() { | 24 void ContentTestSuiteBase::Initialize() { |
24 base::TestSuite::Initialize(); | 25 base::TestSuite::Initialize(); |
| 26 media::InitializeMediaLibraryForTesting(); |
25 | 27 |
26 scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization()); | 28 scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization()); |
27 SetContentClient(client_for_init.get()); | 29 SetContentClient(client_for_init.get()); |
28 RegisterContentSchemes(false); | 30 RegisterContentSchemes(false); |
29 SetContentClient(NULL); | 31 SetContentClient(NULL); |
30 | 32 |
31 RegisterPathProvider(); | 33 RegisterPathProvider(); |
32 ui::RegisterPathProvider(); | 34 ui::RegisterPathProvider(); |
33 | 35 |
34 // Mock out the compositor on platforms that use it. | 36 // Mock out the compositor on platforms that use it. |
35 ui::SetupTestCompositor(); | 37 ui::SetupTestCompositor(); |
36 } | 38 } |
37 | 39 |
38 } // namespace content | 40 } // namespace content |
OLD | NEW |