Add (optional) options to Run[Main]Application().

examples/media_test/media_test_app.cc

 // Copyright 2015 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 <deque>
 #include <iomanip>
 #include <iostream>
 
 #include "base/bind.h"
+#include "base/message_loop/message_loop.h"
 #include "examples/media_test/keystroke.h"
 #include "examples/media_test/media_test.h"
-#include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
-#include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
+#include "mojo/public/cpp/application/run_application.h"
 
 namespace mojo {
 namespace media {
 namespace examples {
 
-class MediaTestApp : public mojo::ApplicationDelegate {
+class MediaTestApp : public mojo::ApplicationImplBase {
  public:
   MediaTestApp() {}
 
   ~MediaTestApp() override {}
 
-  // ApplicationDelegate implementation.
-  void Initialize(mojo::ApplicationImpl* app) override {
-    app_ = app;
-    ProcessArgs(app->args());
+  // ApplicationImplBase overrides.
+  void OnInitialize() override {
+    ProcessArgs(args());
 
     std::cout << std::endl << "MEDIA TEST" << std::endl << std::endl;
 
     if (input_file_names_.empty()) {
       std::cout << "Please provide the names of the files you want to play;"
                 << " for example:" << std::endl
                 << "mojo/devtools/common/mojo_run \\" << std::endl
                 << "    \"https://core.mojoapps.io/media_test.mojo \\"
                 << std::endl
                 << "    http:/localhost/superstition.ogg \\" << std::endl
@@ skipping 47 matching lines @@
       }
     }
 
     input_file_names_iter_ = input_file_names_.begin();
   }
 
   // Creates a new MediaTest object to play the file referenced by
   // input_file_names_iter_.
   void CreateNewMediaTest() {
     MOJO_DCHECK(input_file_names_iter_ != input_file_names_.end());
-    media_test_ = MediaTest::Create(app_, *input_file_names_iter_);
+    media_test_ = MediaTest::Create(shell(), *input_file_names_iter_);
 
     metadata_shown_ = false;
     media_test_->RegisterUpdateCallback(
         [this]() { HandleMediaTestUpdateCallback(); });
 
     media_test_->Play();
   }
 
   void HandleMediaTestUpdateCallback() {
     if (media_test_->state() == MediaTest::State::kEnded &&
@@ skipping 178 matching lines @@
   void PlayNext() {
     if (++input_file_names_iter_ == input_file_names_.end()) {
       input_file_names_iter_ = input_file_names_.begin();
     } else {
       CreateNewMediaTest();
     }
   }
 
   const char* clear_line() const { return paint_ ? kClearLine : ""; }
 
-  mojo::ApplicationImpl* app_;
   std::unique_ptr<MediaTest> media_test_;
   std::deque<std::string> input_file_names_;
   decltype(input_file_names_.begin()) input_file_names_iter_;
   bool quit_ = false;
   bool paint_ = true;
   bool metadata_shown_ = false;
   uint64_t duration_ns_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaTestApp);
 };
 
 const char* MediaTestApp::kHome = "\r";
 const char* MediaTestApp::kClearLine = "\033[K";
 const char* MediaTestApp::kUp = "\033[A";
 
 }  // namespace examples
 }  // namespace media
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunnerChromium runner(
-      new mojo::media::examples::MediaTestApp);
-  return runner.Run(application_request);
+  mojo::media::examples::MediaTestApp media_test_app;
+  return mojo::RunMainApplication(application_request, &media_test_app);
 }