| Index: media/mojo/services/main.cc
|
| diff --git a/media/mojo/services/main.cc b/media/mojo/services/main.cc
|
| index da49ea3981bc00888bcf0ef47cea17204ce481f0..633f0dedb80a947f47427e714e2dcf5c2106d809 100644
|
| --- a/media/mojo/services/main.cc
|
| +++ b/media/mojo/services/main.cc
|
| @@ -9,11 +9,11 @@
|
| #include "media/mojo/services/mojo_media_application.h"
|
| #include "media/mojo/services/test_mojo_media_client.h"
|
| #include "mojo/public/c/system/main.h"
|
| -#include "services/shell/public/cpp/application_runner.h"
|
| +#include "services/shell/public/cpp/service_runner.h"
|
|
|
| namespace {
|
|
|
| -shell::ApplicationRunner* g_runner = nullptr;
|
| +shell::ServiceRunner* g_runner = nullptr;
|
|
|
| void QuitApplication() {
|
| DCHECK(g_runner);
|
| @@ -25,13 +25,13 @@ void QuitApplication() {
|
| MojoResult MojoMain(MojoHandle mojo_handle) {
|
| // Enable logging.
|
| base::AtExitManager at_exit;
|
| - shell::ApplicationRunner::InitBaseCommandLine();
|
| + shell::ServiceRunner::InitBaseCommandLine();
|
|
|
| logging::LoggingSettings settings;
|
| settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
|
| logging::InitLogging(settings);
|
|
|
| - shell::ApplicationRunner runner(new media::MojoMediaApplication(
|
| + shell::ServiceRunner runner(new media::MojoMediaApplication(
|
| base::WrapUnique(new media::TestMojoMediaClient()),
|
| base::Bind(&QuitApplication)));
|
| g_runner = &runner;
|
|
|