Update from https://crrev.com/315085

cc/test/pixel_test.h

Index: cc/test/pixel_test.h
diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h
index 78b8f4a35ff34b808e9725a1d686c301125fb328..356269939f13682bf3e0c7d38ce3806b7f24fe99 100644
--- a/cc/test/pixel_test.h
+++ b/cc/test/pixel_test.h
@@ -89,9 +89,6 @@ class RendererPixelTest : public PixelTest {
     return static_cast<RendererType*>(renderer_.get());
   }
 
-  bool UseSkiaGPUBackend() const;
-  bool ExpandedViewport() const;
-
  protected:
   void SetUp() override;
 };
@@ -145,16 +142,6 @@ inline void RendererPixelTest<GLRenderer>::SetUp() {
 }
 
 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));
@@ -162,68 +149,22 @@ inline void RendererPixelTest<GLRendererWithExpandedViewport>::SetUp() {
 }
 
 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;