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

examples/wget/wget.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 <stdio.h>
 
-#include <memory>
-
 #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_runner.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/system/wait.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/services/network/interfaces/network_service.mojom.h"
 #include "mojo/services/network/interfaces/url_loader.mojom.h"
 
 namespace mojo {
 namespace examples {
 namespace {
 
 class ResponsePrinter {
@@ skipping 44 matching lines @@
         break;
       }
     }
 
     printf("\n>>> EOF <<<\n");
   }
 };
 
 }  // namespace
 
-class WGetApp : public ApplicationDelegate {
+class WGetApp : public ApplicationImplBase {
  public:
-  void Initialize(ApplicationImpl* app) override {
-    ConnectToService(app->shell(), "mojo:network_service",
+  void OnInitialize() override {
+    ConnectToService(shell(), "mojo:network_service",
                      GetProxy(&network_service_));
-    Start(app->args());
+    Start(args());
   }
 
  private:
   void Start(const std::vector<std::string>& args) {
     std::string url((args.size() > 1) ? args[1] : PromptForURL());
     printf("Loading: %s\n", url.c_str());
 
     network_service_->CreateURLLoader(GetProxy(&url_loader_));
 
     URLRequestPtr request(URLRequest::New());
@@ skipping 13 matching lines @@
   }
 
   NetworkServicePtr network_service_;
   URLLoaderPtr url_loader_;
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle application_request) {
-  mojo::ApplicationRunner runner(
-      std::unique_ptr<mojo::examples::WGetApp>(new mojo::examples::WGetApp()));
-  return runner.Run(application_request);
+  mojo::examples::WGetApp wget_app;
+  return mojo::RunMainApplication(application_request, &wget_app);
 }