diff options
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/simple_host_process.cc | 6 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 9 | ||||
| -rw-r--r-- | remoting/run_all_unittests.cc | 9 |
3 files changed, 2 insertions, 22 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc index 92b515e..336bac5 100644 --- a/remoting/host/simple_host_process.cc +++ b/remoting/host/simple_host_process.cc @@ -32,7 +32,6 @@ #include "base/test/mock_chrome_application_mac.h" #include "base/threading/thread.h" #include "crypto/nss_util.h" -#include "media/base/media.h" #include "remoting/base/constants.h" #include "remoting/base/tracer.h" #include "remoting/host/capturer_fake.h" @@ -272,11 +271,6 @@ int main(int argc, char** argv) { base::AtExitManager exit_manager; crypto::EnsureNSPRInit(); - FilePath media_module_path; - PathService::Get(base::DIR_MODULE, &media_module_path); - CHECK(media::InitializeMediaLibrary(media_module_path)) - << "Cannot load media library"; - #if defined(TOOLKIT_USES_GTK) gfx::GtkInitFromCommandLine(*cmd_line); #endif // TOOLKIT_USES_GTK diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 6c18ec9..4ec741e 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -165,7 +165,6 @@ 'remoting_base', 'remoting_host', 'remoting_jingle_glue', - '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ @@ -285,14 +284,13 @@ '../ui/ui.gyp:ui', '../net/net.gyp:net', '../skia/skia.gyp:skia', + '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/zlib/zlib.gyp:zlib', '../media/media.gyp:yuv_convert', 'remoting_jingle_glue', 'proto/chromotocol.gyp:chromotocol_proto_lib', 'proto/trace.gyp:trace_proto_lib', - # TODO(hclam): Enable VP8 in the build. - #'third_party/on2/on2.gyp:vp8', ], 'export_dependent_settings': [ '../base/base.gyp:base', @@ -301,11 +299,6 @@ '../third_party/protobuf/protobuf.gyp:protobuf_lite', 'proto/chromotocol.gyp:chromotocol_proto_lib', ], - # TODO(hclam): Remove this and depend on libvpx directly once we remove - # libvpx from FFmpeg. - 'include_dirs': [ - '../third_party/libvpx/source/libvpx', - ], # This target needs a hard dependency because dependent targets # depend on chromotocol_proto_lib for headers. 'hard_dependency': 1, diff --git a/remoting/run_all_unittests.cc b/remoting/run_all_unittests.cc index 16e4f74..187fb89 100644 --- a/remoting/run_all_unittests.cc +++ b/remoting/run_all_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,15 +6,8 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/test/test_suite.h" -#include "media/base/media.h" int main(int argc, char** argv) { base::TestSuite test_suite(argc, argv); - - // Load the media library so we can use libvpx. - FilePath path; - PathService::Get(base::DIR_MODULE, &path); - CHECK(media::InitializeMediaLibrary(path)) - << "Cannot load media library"; return test_suite.Run(); } |