| Index: media/mojo/services/mojo_media_application.cc
|
| diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
|
| index 501cf939739e1909d21343dec9e606d141c8186c..08c025f593fc0c3cfb96509a18c7c71926efd7e1 100644
|
| --- a/media/mojo/services/mojo_media_application.cc
|
| +++ b/media/mojo/services/mojo_media_application.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include <utility>
|
|
|
| -#include "base/logging.h"
|
| #include "media/base/media_log.h"
|
| #include "media/mojo/services/mojo_media_client.h"
|
| #include "media/mojo/services/service_factory_impl.h"
|
| @@ -17,19 +16,14 @@ namespace media {
|
|
|
| // static
|
| scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
|
| - // In all existing use cases we don't need to initialize logging when using
|
| - // CreateApp() to create the application. We can pass |enable_logging| in
|
| - // CreateApp() if this isn't the case any more in the future.
|
| return scoped_ptr<mojo::ApplicationDelegate>(
|
| - new MojoMediaApplication(false, MojoMediaClient::Create()));
|
| + new MojoMediaApplication(MojoMediaClient::Create()));
|
| }
|
|
|
| // TODO(xhwang): Hook up MediaLog when possible.
|
| MojoMediaApplication::MojoMediaApplication(
|
| - bool enable_logging,
|
| scoped_ptr<MojoMediaClient> mojo_media_client)
|
| - : enable_logging_(enable_logging),
|
| - mojo_media_client_(std::move(mojo_media_client)),
|
| + : mojo_media_client_(std::move(mojo_media_client)),
|
| app_impl_(nullptr),
|
| media_log_(new MediaLog()) {}
|
|
|
| @@ -38,14 +32,6 @@ MojoMediaApplication::~MojoMediaApplication() {
|
|
|
| void MojoMediaApplication::Initialize(mojo::ApplicationImpl* app) {
|
| app_impl_ = app;
|
| -
|
| - if (enable_logging_) {
|
| - logging::LoggingSettings settings;
|
| - settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
|
| - logging::InitLogging(settings);
|
| - // Display process ID, thread ID and timestamp in logs.
|
| - logging::SetLogItems(true, true, true, false);
|
| - }
|
| mojo_media_client_->Initialize();
|
| }
|
|
|
|
|