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.cc7
9 files changed, 20 insertions, 13 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 3818816..3a0858a 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 bf93346..bf9ebd3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -39,7 +39,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',
@@ -2389,6 +2388,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 70bc087..1259510 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',
@@ -2388,6 +2387,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 2abb730..013a3dc 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3114,7 +3114,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',
@@ -3124,6 +3123,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 cd81e0a..57f757c 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -22,7 +22,6 @@
'../components/components.gyp:sessions_test_support',
'../content/content.gyp:content_app',
'../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',
@@ -306,6 +305,7 @@
'../content/content.gyp:content_utility',
'../content/content.gyp:content_worker',
'../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',
@@ -442,7 +442,6 @@
'<@(chromium_child_dependencies)',
# 2) test-specific support libraries:
'../base/base.gyp:test_support_base',
- '../media/media.gyp:media_test_support',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
'../sync/sync.gyp:test_support_sync_api',
@@ -1912,6 +1911,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 5f99db5..67c32f2 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -402,6 +402,7 @@ void BrowserMainLoop::MainMessageLoopStart() {
network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
}
+#if !defined(OS_IOS)
{
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MediaFeatures")
media::InitializeCPUSpecificMediaFeatures();
@@ -414,8 +415,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 c029c29..1cfbb4f2 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',
@@ -376,6 +375,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',
'../ui/gl/gl.gyp:gl',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 5a29b7b..3e68e84 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',
@@ -169,6 +168,7 @@
'content_ppapi_plugin',
'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',
@@ -255,7 +255,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 459c37d..a33c14a 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -13,7 +13,6 @@
#include "content/common/url_schemes.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_paths.h"
-#include "media/base/media.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/ui_base_paths.h"
#include "ui/compositor/compositor_setup.h"
@@ -29,6 +28,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 {
@@ -61,8 +64,10 @@ void ContentTestSuiteBase::Initialize() {
ui::shell_dialogs::RegisterJni(env);
#endif
+#if !defined(OS_IOS)
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-03-05 04:19:22 +0000