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

services/window_manager/window_manager_apptest.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/bind.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 13 matching lines @@
   ~TestApplication() override {}
 
   View* root() const { return root_; }
 
   void set_embed_callback(const base::Closure& callback) {
     embed_callback_ = callback;
   }
 
  private:
   // ApplicationDelegate:
-  virtual void Initialize(ApplicationImpl* app) override {
+  void Initialize(ApplicationImpl* app) override {
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // ViewManagerDelegate:
@@ skipping 158 matching lines @@
   // This call fails if the WindowManager does not have a FocusController.
   EXPECT_EQ(0u, capture_view_id);
   EXPECT_EQ(0u, focused_view_id);
   EXPECT_EQ(0u, active_view_id);
 }
 
 // TODO(msw): Write tests exercising other WindowManager functionality.
 
 }  // namespace
 }  // namespace mojo