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

shell/launcher_main.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/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 28 matching lines @@
             base::FilePath(command_line.GetSwitchValuePath(kShellPath)))) {
     // TODO(vtl): I guess this should be SLAVE, not NONE?
     embedder::InitIPCSupport(embedder::ProcessType::NONE, loop_.task_runner(),
                              this, loop_.task_runner(),
                              embedder::ScopedPlatformHandle());
 
     base::SplitStringAlongWhitespace(command_line.GetSwitchValueASCII(kAppArgs),
                                      &app_args_);
   }
 
-  ~Launcher() {
+  ~Launcher() override {
     // TODO(vtl): We need to destroy this before calling
     // ShutdownIPCSupportOnIOThread(). This is all quite sketchy, and we really
     // should convert all of this to running the application on the main thread,
     // with a separate I/O thread (and managing the lifetime of everything more
     // carefully).
     connection_.reset();
     DCHECK(!application_request_.is_pending());
 
     embedder::ShutdownIPCSupportOnIOThread();
   }
@@ skipping 63 matching lines @@
 
   if (!launcher.Register()) {
     LOG(ERROR) << "Error registering "
                << command_line->GetSwitchValueASCII(mojo::shell::kAppURL);
     return 1;
   }
 
   launcher.Run();
   return 0;
 }