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

gpu/config/gpu_info_collector_unittest.cc

Index: gpu/config/gpu_info_collector_unittest.cc
diff --git a/gpu/config/gpu_info_collector_unittest.cc b/gpu/config/gpu_info_collector_unittest.cc
index c5e15c81b8be064db29b342023fa1f33f4f8c6fd..e5705ad5a2f1eaf31611e26da810bd962ca45866 100644
--- a/gpu/config/gpu_info_collector_unittest.cc
+++ b/gpu/config/gpu_info_collector_unittest.cc
@@ -17,9 +17,9 @@ namespace gpu {
 class GPUInfoCollectorTest : public testing::Test {
  public:
   GPUInfoCollectorTest() {}
-  virtual ~GPUInfoCollectorTest() { }
+  ~GPUInfoCollectorTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     gl_.reset(new ::testing::StrictMock< ::gfx::MockGLInterface>());
     ::gfx::MockGLInterface::SetGLInterface(gl_.get());
 #if defined(OS_WIN)
@@ -91,7 +91,7 @@ class GPUInfoCollectorTest : public testing::Test {
             gl_renderer)));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     ::gfx::MockGLInterface::SetGLInterface(NULL);
     gl_.reset();
   }