Some more virtual/override updates.

mojo/services/window_manager/window_manager_api_unittest.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/memory/scoped_vector.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
@@ skipping 125 matching lines @@
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplicationLoader);
 };
 
 }  // namespace
 
 class WindowManagerApiTest : public testing::Test {
  public:
   WindowManagerApiTest() {}
-  virtual ~WindowManagerApiTest() {}
+  ~WindowManagerApiTest() override {}
 
  protected:
   typedef std::pair<Id, Id> TwoIds;
 
   Id WaitForEmbed() {
     Id id;
     base::RunLoop run_loop;
     root_added_callback_ = base::Bind(&WindowManagerApiTest::OnEmbed,
                                       base::Unretained(this), &id, &run_loop);
     run_loop.Run();
@@ skipping 30 matching lines @@
   }
 
   TestWindowManagerClient* window_manager_client() {
     return window_manager_client_.get();
   }
 
   WindowManagerService2Ptr window_manager_;
 
  private:
   // Overridden from testing::Test:
-  virtual void SetUp() override {
+  void SetUp() override {
     test_helper_.Init();
     test_helper_.SetLoaderForURL(
         scoped_ptr<ApplicationLoader>(new TestApplicationLoader(base::Bind(
             &WindowManagerApiTest::OnRootAdded, base::Unretained(this)))),
         GURL(kTestServiceURL));
     test_helper_.application_manager()->ConnectToService(
         GURL("mojo:view_manager"), &view_manager_init_);
     ASSERT_TRUE(
         InitEmbed(view_manager_init_.get(), "mojo:core_window_manager"));
     ConnectToWindowManager();
   }
-  virtual void TearDown() override {}
+  void TearDown() override {}
 
   void ConnectToWindowManager() {
     test_helper_.application_manager()->ConnectToService(
         GURL("mojo:core_window_manager"), &window_manager_);
     base::RunLoop connect_loop;
     window_manager_client_.reset(new TestWindowManagerClient(&connect_loop));
     window_manager_.set_client(window_manager_client());
     connect_loop.Run();
   }
 
@@ skipping 47 matching lines @@
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo