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

gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc

Index: gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc
diff --git a/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc b/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc
index c3132731201de204e3f1b12fcfc3180911cce952..81e243548dccc2edb7baaabd431a87e6401972a8 100644
--- a/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc
+++ b/gpu/command_buffer/tests/gl_bind_uniform_location_unittest.cc
@@ -18,15 +18,13 @@ namespace gpu {
 class BindUniformLocationTest : public testing::Test {
  protected:
   static const GLsizei kResolution = 4;
-  virtual void SetUp() {
+  void SetUp() override {
     GLManager::Options options;
     options.size = gfx::Size(kResolution, kResolution);
     gl_.Initialize(options);
   }
 
-  virtual void TearDown() {
-    gl_.Destroy();
-  }
+  void TearDown() override { gl_.Destroy(); }
 
   GLManager gl_;
 };