| Index: content/test/content_test_suite_base.cc
|
| diff --git a/content/test/content_test_suite_base.cc b/content/test/content_test_suite_base.cc
|
| index 3274f1bc3c77988a51ba1a63b789d64ecded4be3..0c328589abebf03e91e1c802c3dcb8811130c2ff 100644
|
| --- a/content/test/content_test_suite_base.cc
|
| +++ b/content/test/content_test_suite_base.cc
|
| @@ -18,12 +18,15 @@
|
| namespace content {
|
|
|
| ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv)
|
| - : base::TestSuite(argc, argv) {
|
| + : base::TestSuite(argc, argv),
|
| + external_libraries_enabled_(true) {
|
| }
|
|
|
| void ContentTestSuiteBase::Initialize() {
|
| base::TestSuite::Initialize();
|
| - media::InitializeMediaLibraryForTesting();
|
| +
|
| + if (external_libraries_enabled_)
|
| + media::InitializeMediaLibraryForTesting();
|
|
|
| scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
|
| SetContentClient(client_for_init.get());
|
|
|