Update from chromium https://crrev.com/301725/

gpu/config/gpu_blacklist_unittest.cc

Index: gpu/config/gpu_blacklist_unittest.cc
diff --git a/gpu/config/gpu_blacklist_unittest.cc b/gpu/config/gpu_blacklist_unittest.cc
index 7547a17194796a8ea44c91140a07e0588b98ee57..c9fa415760c64479ab18769a245c07249c196593 100644
--- a/gpu/config/gpu_blacklist_unittest.cc
+++ b/gpu/config/gpu_blacklist_unittest.cc
@@ -17,7 +17,7 @@ class GpuBlacklistTest : public testing::Test {
  public:
   GpuBlacklistTest() { }
 
-  virtual ~GpuBlacklistTest() { }
+  ~GpuBlacklistTest() override {}
 
   const GPUInfo& gpu_info() const {
     return gpu_info_;
@@ -55,7 +55,7 @@ class GpuBlacklistTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     gpu_info_.gpu.vendor_id = 0x10de;
     gpu_info_.gpu.device_id = 0x0640;
     gpu_info_.driver_vendor = "NVIDIA";
@@ -70,8 +70,7 @@ class GpuBlacklistTest : public testing::Test {
     gpu_info_.performance_stats.overall = 5.0;
   }
 
-  virtual void TearDown() {
-  }
+  void TearDown() override {}
 
  private:
   GPUInfo gpu_info_;