Update from https://crrev.com/314320

cc/test/fake_tile_manager_client.h

Index: cc/test/fake_tile_manager_client.h
diff --git a/cc/test/fake_tile_manager_client.h b/cc/test/fake_tile_manager_client.h
index ef1eaca86ff8a6eb55a26598943106d7c4e93b76..3afe2f587f6b50265c636d799a196f656e7c1655 100644
--- a/cc/test/fake_tile_manager_client.h
+++ b/cc/test/fake_tile_manager_client.h
@@ -17,7 +17,6 @@ class FakeTileManagerClient : public TileManagerClient {
   ~FakeTileManagerClient() override;
 
   // TileManagerClient implementation.
-  const std::vector<PictureLayerImpl*>& GetPictureLayers() const override;
   void NotifyReadyToActivate() override {}
   void NotifyReadyToDraw() override {}
   void NotifyTileStateChanged(const Tile* tile) override {}
@@ -26,9 +25,7 @@ class FakeTileManagerClient : public TileManagerClient {
       RasterTilePriorityQueue::Type type) override;
   scoped_ptr<EvictionTilePriorityQueue> BuildEvictionQueue(
       TreePriority tree_priority) override;
-
- private:
-  std::vector<PictureLayerImpl*> picture_layers_;
+  void SetIsLikelyToRequireADraw(bool is_likely_to_require_a_draw) override {}
 };
 
 }  // namespace cc