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

gpu/command_buffer/client/vertex_array_object_manager_unittest.cc

Index: gpu/command_buffer/client/vertex_array_object_manager_unittest.cc
diff --git a/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc b/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc
index b3ac0654c18a9be57f8fa069fb29ded365a5fa79..e8911841b86d3a8420edbd34c75b8af9cd731d45 100644
--- a/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc
+++ b/gpu/command_buffer/client/vertex_array_object_manager_unittest.cc
@@ -16,14 +16,13 @@ class VertexArrayObjectManagerTest : public testing::Test {
   static const GLuint kClientSideArrayBuffer = 0x1234;
   static const GLuint kClientSideElementArrayBuffer = 0x1235;
 
-  virtual void SetUp() {
+  void SetUp() override {
     manager_.reset(new VertexArrayObjectManager(
         kMaxAttribs,
         kClientSideArrayBuffer,
         kClientSideElementArrayBuffer));
   }
-  virtual void TearDown() {
-  }
+  void TearDown() override {}
 
   scoped_ptr<VertexArrayObjectManager> manager_;
 };