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

Side by Side Diff: content/test/content_test_suite_base.cc

Issue 10786038: Prevent loading libffmpegsumo.so to python (autotests) process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iteration Created 8 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 (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 "media/base/media.h"
15 #include "ui/base/ui_base_paths.h" 15 #include "ui/base/ui_base_paths.h"
16 #include "ui/compositor/compositor_setup.h" 16 #include "ui/compositor/compositor_setup.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv) 20 ContentTestSuiteBase::ContentTestSuiteBase(int argc, char** argv)
21 : base::TestSuite(argc, argv) { 21 : base::TestSuite(argc, argv),
22 external_libraries_enabled_(true) {
22 } 23 }
23 24
24 void ContentTestSuiteBase::Initialize() { 25 void ContentTestSuiteBase::Initialize() {
25 base::TestSuite::Initialize(); 26 base::TestSuite::Initialize();
26 media::InitializeMediaLibraryForTesting(); 27
28 if (external_libraries_enabled_)
29 media::InitializeMediaLibraryForTesting();
27 30
28 scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization()); 31 scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
29 SetContentClient(client_for_init.get()); 32 SetContentClient(client_for_init.get());
30 RegisterContentSchemes(false); 33 RegisterContentSchemes(false);
31 SetContentClient(NULL); 34 SetContentClient(NULL);
32 35
33 RegisterPathProvider(); 36 RegisterPathProvider();
34 ui::RegisterPathProvider(); 37 ui::RegisterPathProvider();
35 38
36 // Mock out the compositor on platforms that use it. 39 // Mock out the compositor on platforms that use it.
37 ui::SetupTestCompositor(); 40 ui::SetupTestCompositor();
38 } 41 }
39 42
40 } // namespace content 43 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698