Update from https://crrev.com/315085

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 71 matching lines @@
   scoped_ptr<gfx::DisableNullDrawGLBindings> enable_pixel_output_;
 };
 
 template<typename RendererType>
 class RendererPixelTest : public PixelTest {
  public:
   RendererType* renderer() {
     return static_cast<RendererType*>(renderer_.get());
   }
 
-  bool UseSkiaGPUBackend() const;
-  bool ExpandedViewport() const;
-
  protected:
   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 RendererSettings* settings,
@@ skipping 33 matching lines @@
                    texture_mailbox_deleter,
                    highp_threshold_min) {}
 };
 
 template<>
 inline void RendererPixelTest<GLRenderer>::SetUp() {
   SetUpGLRenderer(false, false);
 }
 
 template<>
-inline bool RendererPixelTest<GLRenderer>::UseSkiaGPUBackend() const {
-  return false;
-}
-
-template<>
-inline bool RendererPixelTest<GLRenderer>::ExpandedViewport() const {
-  return false;
-}
-
-template<>
 inline void RendererPixelTest<GLRendererWithExpandedViewport>::SetUp() {
   SetUpGLRenderer(false, false);
   ForceExpandedViewport(gfx::Size(50, 50));
   ForceViewportOffset(gfx::Vector2d(10, 20));
 }
 
 template <>
-inline bool
-RendererPixelTest<GLRendererWithExpandedViewport>::UseSkiaGPUBackend() const {
-  return false;
-}
-
-template <>
-inline bool
-RendererPixelTest<GLRendererWithExpandedViewport>::ExpandedViewport() const {
-  return true;
-}
-
-template <>
 inline void RendererPixelTest<GLRendererWithFlippedSurface>::SetUp() {
   SetUpGLRenderer(false, true);
 }
 
 template <>
-inline bool RendererPixelTest<GLRendererWithFlippedSurface>::UseSkiaGPUBackend()
-    const {
-  return false;
-}
-
-template <>
-inline bool RendererPixelTest<GLRendererWithFlippedSurface>::ExpandedViewport()
-    const {
-  return true;
-}
-
-template <>
 inline void RendererPixelTest<SoftwareRenderer>::SetUp() {
   SetUpSoftwareRenderer();
 }
 
 template<>
-inline bool RendererPixelTest<SoftwareRenderer>::UseSkiaGPUBackend() const {
-  return false;
-}
-
-template <>
-inline bool RendererPixelTest<SoftwareRenderer>::ExpandedViewport() const {
-  return false;
-}
-
-template<>
 inline void RendererPixelTest<SoftwareRendererWithExpandedViewport>::SetUp() {
   SetUpSoftwareRenderer();
   ForceExpandedViewport(gfx::Size(50, 50));
   ForceViewportOffset(gfx::Vector2d(10, 20));
 }
 
-template <>
-inline bool RendererPixelTest<
-    SoftwareRendererWithExpandedViewport>::UseSkiaGPUBackend() const {
-  return false;
-}
-
-template <>
-inline bool RendererPixelTest<
-    SoftwareRendererWithExpandedViewport>::ExpandedViewport() const {
-  return true;
-}
-
 typedef RendererPixelTest<GLRenderer> GLRendererPixelTest;
 typedef RendererPixelTest<SoftwareRenderer> SoftwareRendererPixelTest;
 
 }  // namespace cc
 
 #endif  // CC_TEST_PIXEL_TEST_H_