Update from https://crrev.com/309717

cc/resources/prioritized_resource_unittest.cc

 // Copyright 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 "cc/resources/prioritized_resource.h"
 
 #include <vector>
 
 #include "cc/resources/prioritized_resource_manager.h"
 #include "cc/resources/resource.h"
@@ skipping 19 matching lines @@
     shared_bitmap_manager_.reset(new TestSharedBitmapManager());
     resource_provider_ = ResourceProvider::Create(output_surface_.get(),
                                                   shared_bitmap_manager_.get(),
                                                   NULL,
                                                   NULL,
                                                   0,
                                                   false,
                                                   1);
   }
 
-  virtual ~PrioritizedResourceTest() {
+  ~PrioritizedResourceTest() override {
     DebugScopedSetImplThread impl_thread(&proxy_);
     resource_provider_ = nullptr;
   }
 
   size_t TexturesMemorySize(size_t texture_count) {
     return Resource::MemorySizeBytes(texture_size_, texture_format_) *
            texture_count;
   }
 
   scoped_ptr<PrioritizedResourceManager> CreateManager(size_t max_textures) {
@@ skipping 1057 matching lines @@
               resource_manager->MemoryVisibleAndNearbyBytes());
   }
 
   DebugScopedSetImplThreadAndMainThreadBlocked
       impl_thread_and_main_thread_blocked(&proxy_);
   resource_manager->ClearAllMemory(resource_provider());
 }
 
 }  // namespace
 }  // namespace cc