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

mojo/services/view_manager/public/cpp/tests/view_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 "mojo/services/view_manager/public/cpp/view.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/services/view_manager/public/cpp/lib/view_private.h"
 #include "mojo/services/view_manager/public/cpp/util.h"
@@ skipping 724 matching lines @@
   }
 }
 
 namespace {
 
 class SharedPropertyChangeObserver : public ViewObserver {
  public:
   explicit SharedPropertyChangeObserver(View* view) : view_(view) {
     view_->AddObserver(this);
   }
-  virtual ~SharedPropertyChangeObserver() { view_->RemoveObserver(this); }
+  ~SharedPropertyChangeObserver() override { view_->RemoveObserver(this); }
 
   Changes GetAndClearChanges() {
     Changes changes;
     changes.swap(changes_);
     return changes;
   }
 
  private:
   // Overridden from ViewObserver:
   void OnViewSharedPropertyChanged(
@@ skipping 72 matching lines @@
 typedef std::pair<const void*, intptr_t> PropertyChangeInfo;
 
 class LocalPropertyChangeObserver : public ViewObserver {
  public:
   explicit LocalPropertyChangeObserver(View* view)
       : view_(view),
         property_key_(nullptr),
         old_property_value_(-1) {
     view_->AddObserver(this);
   }
-  virtual ~LocalPropertyChangeObserver() { view_->RemoveObserver(this); }
+  ~LocalPropertyChangeObserver() override { view_->RemoveObserver(this); }
 
   PropertyChangeInfo PropertyChangeInfoAndClear() {
     PropertyChangeInfo result(property_key_, old_property_value_);
     property_key_ = NULL;
     old_property_value_ = -3;
     return result;
   }
 
  private:
   void OnViewLocalPropertyChanged(View* window,
@@ skipping 26 matching lines @@
   EXPECT_EQ(PropertyChangeInfo(&prop, -2), o.PropertyChangeInfoAndClear());
   v1.ClearLocalProperty(&prop);
   EXPECT_EQ(PropertyChangeInfo(&prop, 3), o.PropertyChangeInfoAndClear());
 
   // Sanity check to see if |PropertyChangeInfoAndClear| really clears.
   EXPECT_EQ(PropertyChangeInfo(
       reinterpret_cast<const void*>(NULL), -3), o.PropertyChangeInfoAndClear());
 }
 
 }  // namespace mojo