Update from https://crrev.com/304418

cc/test/pixel_test.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_util.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
 #include "cc/quads/render_pass.h"
 #include "cc/test/pixel_comparator.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 75 matching lines @@
 class RendererPixelTest : public PixelTest {
  public:
   RendererType* renderer() {
     return static_cast<RendererType*>(renderer_.get());
   }
 
   bool UseSkiaGPUBackend() const;
   bool ExpandedViewport() const;
 
  protected:
-  virtual void SetUp() override;
+  void SetUp() override;
 };
 
 // Wrappers to differentiate renderers where the the output surface and viewport
 // have an externally determined size and offset.
 class GLRendererWithExpandedViewport : public GLRenderer {
  public:
   GLRendererWithExpandedViewport(RendererClient* client,
                                  const LayerTreeSettings* settings,
                                  OutputSurface* output_surface,
                                  ResourceProvider* resource_provider,
@@ skipping 116 matching lines @@
     SoftwareRendererWithExpandedViewport>::ExpandedViewport() const {
   return true;
 }
 
 typedef RendererPixelTest<GLRenderer> GLRendererPixelTest;
 typedef RendererPixelTest<SoftwareRenderer> SoftwareRendererPixelTest;
 
 }  // namespace cc
 
 #endif  // CC_TEST_PIXEL_TEST_H_