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

services/window_manager/focus_controller_unittest.cc

 // Copyright (c) 2012 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 "services/window_manager/focus_controller.h"
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "services/window_manager/basic_focus_rules.h"
 #include "services/window_manager/capture_controller.h"
 #include "services/window_manager/focus_controller_observer.h"
@@ skipping 1053 matching lines @@
   FocusControllerRemovalTest(bool parent)
       : FocusControllerImplicitTestBase(parent),
         window_to_destroy_(nullptr) {}
 
   // Overridden from FocusControllerImplicitTestBase:
   void ChangeViewDisposition(View* view) override {
     View* disposition_view = GetDispositionView(view);
     disposition_view->parent()->RemoveChild(disposition_view);
     window_to_destroy_ = disposition_view;
   }
-  virtual void TearDown() override {
+  void TearDown() override {
     if (window_to_destroy_)
       window_to_destroy_->Destroy();
 
     FocusControllerImplicitTestBase::TearDown();
   }
 
  private:
   View* window_to_destroy_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerRemovalTest);
@@ skipping 100 matching lines @@
 
 // See description above DontPassDestroyedView() for details.
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDestroyedView);
 
 // TODO(erg): Add the TextInputClient tests here.
 
 // If a mouse event was handled, it should not activate a view.
 FOCUS_CONTROLLER_TEST(FocusControllerMouseEventTest, IgnoreHandledEvent);
 
 }  // namespace window_manager