Update from https://crrev.com/309717

cc/surfaces/surface_factory_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 "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ skipping 25 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestSurfaceFactoryClient);
 };
 
 class SurfaceFactoryTest : public testing::Test {
  public:
   SurfaceFactoryTest() : factory_(&manager_, &client_), surface_id_(3) {
     factory_.Create(surface_id_);
   }
 
-  virtual ~SurfaceFactoryTest() {
+  ~SurfaceFactoryTest() override {
     if (!surface_id_.is_null())
       factory_.Destroy(surface_id_);
   }
 
   void SubmitFrameWithResources(ResourceProvider::ResourceId* resource_ids,
                                 size_t num_resource_ids) {
     scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
     for (size_t i = 0u; i < num_resource_ids; ++i) {
       TransferableResource resource;
       resource.id = resource_ids[i];
@@ skipping 356 matching lines @@
   factory_.Create(id2);
   DCHECK(manager_.GetSurfaceForId(id2));
   manager_.GetSurfaceForId(id2)
       ->AddDestructionDependency(SurfaceSequence(0, 6));
   factory_.Destroy(id2);
   DCHECK(!manager_.GetSurfaceForId(id2));
 }
 
 }  // namespace
 }  // namespace cc