Clean up media/mojo target names.

media/mojo/services/mojo_renderer_service.cc

 // Copyright 2014 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.
 
 #include "media/mojo/services/mojo_renderer_service.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/memory/scoped_vector.h"
+#include "base/message_loop/message_loop.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_renderer.h"
 #include "media/base/audio_renderer_sink.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_log.h"
 #include "media/base/video_renderer.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/renderer_impl.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/mojo/services/demuxer_stream_provider_shim.h"
 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
 #include "media/mojo/services/renderer_config.h"
-#include "mojo/application/application_runner_chromium.h"
-#include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/interface_factory_impl.h"
 
 namespace media {
 
 // Time interval to update media time.
 const int kTimeUpdateIntervalMs = 50;
 
 static void LogMediaSourceError(const scoped_refptr<MediaLog>& media_log,
                                 const std::string& error) {
   media_log->AddEvent(media_log->CreateMediaSourceErrorEvent(error));
 }
 
 static void PaintNothing(const scoped_refptr<VideoFrame>& frame) {
 }
 
-class MojoRendererApplication
-    : public mojo::ApplicationDelegate,
-      public mojo::InterfaceFactory<mojo::MediaRenderer> {
- public:
-  // mojo::ApplicationDelegate implementation.
-  bool ConfigureIncomingConnection(
-      mojo::ApplicationConnection* connection) override {
-    connection->AddService(this);
-    return true;
-  }
-
-  // mojo::InterfaceFactory<mojo::MediaRenderer> implementation.
-  void Create(mojo::ApplicationConnection* connection,
-              mojo::InterfaceRequest<mojo::MediaRenderer> request) override {
-    mojo::BindToRequest(new MojoRendererService(), &request);
-  }
-};
-
 static void MojoTrampoline(const mojo::Closure& closure) {
   closure.Run();
 }
 
 MojoRendererService::MojoRendererService()
     : state_(STATE_UNINITIALIZED),
       last_media_time_usec_(0),
       weak_factory_(this),
       weak_this_(weak_factory_.GetWeakPtr()) {
   DVLOG(1) << __FUNCTION__;
@@ skipping 127 matching lines @@
   time_update_timer_.Reset();
 }
 
 void MojoRendererService::OnError(PipelineStatus error) {
   DVLOG(1) << __FUNCTION__;
   state_ = STATE_ERROR;
   client()->OnError();
 }
 
 }  // namespace media
-
-MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunnerChromium runner(new media::MojoRendererApplication);
-  return runner.Run(shell_handle);
-}