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

gpu/command_buffer/service/feature_info_unittest.cc

Index: gpu/command_buffer/service/feature_info_unittest.cc
diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
index a97188fbb1717cfd4fadbb918fe699bfd0ad61a6..69bd4d3544d85647771b2c43d9fecac0e4af7a15 100644
--- a/gpu/command_buffer/service/feature_info_unittest.cc
+++ b/gpu/command_buffer/service/feature_info_unittest.cc
@@ -74,11 +74,11 @@ class FeatureInfoTest : public GpuServiceTest {
   }
 
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     // Do nothing here, since we are using the explicit Setup*() functions.
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     info_ = NULL;
     GpuServiceTest::TearDown();
   }