| Index: media/mojo/services/android_mojo_media_application.cc
|
| diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_application.cc
|
| similarity index 84%
|
| rename from media/mojo/services/android_mojo_media_client.cc
|
| rename to media/mojo/services/android_mojo_media_application.cc
|
| index dd9a745502d3e25b272a3aff47d4c9b7fc39de1c..25088c0d5ba70b6627a05b1787457f7b225214ed 100644
|
| --- a/media/mojo/services/android_mojo_media_client.cc
|
| +++ b/media/mojo/services/android_mojo_media_application.cc
|
| @@ -2,7 +2,7 @@
|
| // 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_media_client.h"
|
| +#include "media/mojo/services/mojo_media_application.h"
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -10,6 +10,7 @@
|
| #include "media/base/bind_to_current_loop.h"
|
| #include "media/base/media.h"
|
| #include "media/mojo/interfaces/provision_fetcher.mojom.h"
|
| +#include "media/mojo/services/mojo_media_client.h"
|
| #include "media/mojo/services/mojo_provision_fetcher.h"
|
| #include "mojo/shell/public/cpp/connect.h"
|
|
|
| @@ -40,8 +41,10 @@ class AndroidMojoMediaClient : public MojoMediaClient {
|
| };
|
| } // namespace (anonymous)
|
|
|
| -scoped_ptr<MojoMediaClient> MojoMediaClient::Create() {
|
| - return make_scoped_ptr(new AndroidMojoMediaClient());
|
| +// static
|
| +scoped_ptr<mojo::ApplicationDelegate> MojoMediaApplication::CreateApp() {
|
| + return make_scoped_ptr(
|
| + new MojoMediaApplication(make_scoped_ptr(new AndroidMojoMediaClient())));
|
| }
|
|
|
| } // namespace media
|
|
|