summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/all.gyp4
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--chrome/chrome_browser_ui.gypi2
-rw-r--r--chrome/chrome_tests.gypi5
-rw-r--r--chrome/chrome_tests_unit.gypi4
-rw-r--r--content/browser/browser_main_loop.cc3
-rw-r--r--content/content_common.gypi2
-rw-r--r--content/content_tests.gypi4
-rw-r--r--content/public/test/content_test_suite_base.cc8
9 files changed, 19 insertions, 15 deletions
diff --git a/build/all.gyp b/build/all.gyp
index ff45b74..32ad72a 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -14,7 +14,6 @@
'../chrome/chrome.gyp:*',
'../content/content.gyp:*',
'../crypto/crypto.gyp:*',
- '../media/media.gyp:*',
'../net/net.gyp:*',
'../sdch/sdch.gyp:*',
'../sql/sql.gyp:*',
@@ -41,6 +40,7 @@
'../gpu/tools/tools.gyp:*',
'../ipc/ipc.gyp:*',
'../jingle/jingle.gyp:*',
+ '../media/media.gyp:*',
'../ppapi/ppapi.gyp:*',
'../ppapi/ppapi_internal.gyp:*',
'../printing/printing.gyp:*',
@@ -207,7 +207,6 @@
'../base/base.gyp:base_unittests',
'../chrome/chrome.gyp:unit_tests',
'../crypto/crypto.gyp:crypto_unittests',
- '../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests',
'../sql/sql.gyp:sql_unittests',
'../ui/ui.gyp:ui_unittests',
@@ -232,6 +231,7 @@
'../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
+ '../media/media.gyp:media_unittests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
'../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c3f2552..926a329 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -40,7 +40,6 @@
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../jingle/jingle.gyp:notifier',
- '../media/media.gyp:media',
'../skia/skia.gyp:skia',
'../sql/sql.gyp:sql',
'../sync/sync.gyp:sync',
@@ -2491,6 +2490,7 @@
'../cc/cc.gyp:cc',
'../components/components.gyp:autofill_content_browser',
'../components/components.gyp:navigation_interception',
+ '../media/media.gyp:media',
'../net/net.gyp:net_with_v8',
'../printing/printing.gyp:printing',
'../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 6a817fb..560b1a6 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -34,7 +34,6 @@
'../content/content.gyp:content_browser',
'../content/content.gyp:content_common',
'../crypto/crypto.gyp:crypto',
- '../media/media.gyp:media',
'../skia/skia.gyp:skia',
'../sync/sync.gyp:sync',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
@@ -2416,6 +2415,7 @@
'../components/components.gyp:autofill_content_risk_proto',
'../components/component_strings.gyp:component_strings',
'../device/bluetooth/bluetooth.gyp:device_bluetooth',
+ '../media/media.gyp:media',
'../net/net.gyp:net_with_v8',
'../printing/printing.gyp:printing',
'../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2cc4cc1..6802d1c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3167,7 +3167,6 @@
# Disabling for now (enabled on linux/windows below).
# 'browser_tests',
'../ipc/ipc.gyp:ipc_tests',
- '../media/media.gyp:media_unittests',
'../net/net.gyp:net_unittests',
'../printing/printing.gyp:printing_unittests',
'../remoting/remoting.gyp:remoting_unittests',
@@ -3177,6 +3176,10 @@
'../sync/sync.gyp:sync_unit_tests',
], # 'dependencies'
'conditions': [
+ ['OS!="ios"', {
+ 'dependencies': [
+ '../media/media.gyp:media_unittests',
+ ]}],
['OS=="win"', {
'dependencies': [
# Courgette has not been ported from Windows.
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index e0ad6fa..2c1e640f 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -21,7 +21,6 @@
'../components/components.gyp:sessions_test_support',
'../content/content.gyp:content_app_both',
'../content/content.gyp:test_support_content',
- '../media/media.gyp:media_test_support',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
@@ -305,6 +304,7 @@
'../content/content.gyp:content_worker',
'../components/components.gyp:autofill_core_test_support',
'../ipc/ipc.gyp:test_support_ipc',
+ '../media/media.gyp:media_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../webkit/support/webkit_support.gyp:glue_child',
@@ -456,7 +456,6 @@
# 2) test-specific support libraries:
'../base/base.gyp:test_support_base',
'../content/content.gyp:content_app_both',
- '../media/media.gyp:media_test_support',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../sync/sync.gyp:test_support_sync_api',
@@ -1977,6 +1976,7 @@
'../components/component_strings.gyp:component_strings',
'../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'../gpu/gpu.gyp:gpu_unittest_utils',
+ '../media/media.gyp:media_test_support',
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
'../third_party/cld/cld.gyp:cld',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 87bec3d..ee84e7c 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -420,6 +420,7 @@ void BrowserMainLoop::MainMessageLoopStart() {
network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
}
+#if !defined(OS_IOS)
{
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
media::InitializeCPUSpecificMediaFeatures();
@@ -432,8 +433,6 @@ void BrowserMainLoop::MainMessageLoopStart() {
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MIDIManager")
midi_manager_.reset(media::MIDIManager::Create());
}
-
-#if !defined(OS_IOS)
{
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:ContentWebUIController")
WebUIControllerFactory::RegisterFactory(
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 18ecdea..a4f7a42 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -6,7 +6,6 @@
'dependencies': [
'../base/base.gyp:base',
'../components/tracing.gyp:tracing',
- '../media/media.gyp:media',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icuuc',
@@ -395,6 +394,7 @@
'../gpu/gpu.gyp:gles2_implementation',
'../gpu/gpu.gyp:gpu_ipc',
'../ipc/ipc.gyp:ipc',
+ '../media/media.gyp:media',
'../media/media.gyp:shared_memory_support',
'../third_party/WebKit/public/blink.gyp:blink_minimal',
'../ui/gl/gl.gyp:gl',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 309e84b..f7f5951 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -9,7 +9,6 @@
'type': 'static_library',
'defines!': ['CONTENT_IMPLEMENTATION'],
'dependencies': [
- '../media/media.gyp:media',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
@@ -174,6 +173,7 @@
'content_renderer',
'content_utility',
'content_worker',
+ '../media/media.gyp:media',
'../ppapi/ppapi_internal.gyp:ppapi_host',
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../ppapi/ppapi_internal.gyp:ppapi_shared',
@@ -259,7 +259,6 @@
'browser/speech/proto/speech_proto.gyp:speech_proto',
'../base/base.gyp:test_support_base',
'../crypto/crypto.gyp:crypto',
- '../media/media.gyp:media_test_support',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
'../sql/sql.gyp:sql',
@@ -576,6 +575,7 @@
'../gpu/gpu.gyp:gpu_unittest_utils',
'../ipc/ipc.gyp:test_support_ipc',
'../jingle/jingle.gyp:jingle_glue_test_util',
+ '../media/media.gyp:media_test_support',
'../media/media.gyp:shared_memory_support',
'../third_party/WebKit/public/blink.gyp:blink',
'../third_party/icu/icu.gyp:icui18n',
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index f245683..ce6eac3 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -19,7 +19,6 @@
#include "content/public/common/content_paths.h"
#include "content/renderer/renderer_main_thread.h"
#include "content/utility/utility_main_thread.h"
-#include "media/base/media.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_paths.h"
@@ -34,6 +33,10 @@
#include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
#endif
+#if !defined(OS_IOS)
+#include "media/base/media.h"
+#endif
+
namespace content {
class ContentTestSuiteBaseListener : public testing::EmptyTestEventListener {
@@ -71,10 +74,9 @@ void ContentTestSuiteBase::Initialize() {
RenderProcessHost::RegisterRendererMainThreadFactory(
CreateRendererMainThread);
GpuProcessHost::RegisterGpuMainThreadFactory(CreateGpuMainThread);
-#endif
-
if (external_libraries_enabled_)
media::InitializeMediaLibraryForTesting();
+#endif
scoped_ptr<ContentClient> client_for_init(CreateClientForInitialization());
SetContentClient(client_for_init.get());
generated by cgit v1.1 at 2025-02-10 12:20:27 +0000