Chromium roll (https://codereview.chromium.org/976353002)

examples/forwarding_content_handler/forwarding_content_handler.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 "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/application/content_handler_factory.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/c/system/main.h"
@@ skipping 39 matching lines @@
   ShellPtr shell_;
 };
 
 class ForwardingContentHandler : public ApplicationDelegate,
                                  public ContentHandlerFactory::ManagedDelegate {
  public:
   ForwardingContentHandler() : content_handler_factory_(this) {}
 
  private:
   // Overridden from ApplicationDelegate:
-  virtual bool ConfigureIncomingConnection(
-      ApplicationConnection* connection) override {
+  bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(&content_handler_factory_);
     return true;
   }
 
   // Overridden from ContentHandlerFactory::ManagedDelegate:
-  virtual scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
+  scoped_ptr<ContentHandlerFactory::HandledApplicationHolder>
   CreateApplication(InterfaceRequest<Application> application_request,
                     URLResponsePtr response) override {
     CHECK(!response.is_null());
     const std::string requestor_url(response->url);
     std::string target_url;
     if(!common::BlockingCopyToString(response->body.Pass(), &target_url)) {
       LOG(WARNING) << "unable to read target URL from " << requestor_url;
       return nullptr;
     }
     return make_handled_factory_holder(
         new ForwardingApplicationImpl(application_request.Pass(), target_url));
   }
 
   ContentHandlerFactory content_handler_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ForwardingContentHandler);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(
       new mojo::examples::ForwardingContentHandler());
   return runner.Run(shell_handle);
 }