Refactor client visibility handling

cc/test/test_context_provider.h

Index: cc/test/test_context_provider.h
diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h
index d7c5627f4781e5f13a47704a8c73cb90f37517a6..816c9aec7dddb4eee9fc190f5a3d76ed7e34569c 100644
--- a/cc/test/test_context_provider.h
+++ b/cc/test/test_context_provider.h
@@ -47,9 +47,9 @@ class TestContextProvider : public ContextProvider {
   gpu::gles2::GLES2Interface* ContextGL() override;
   gpu::ContextSupport* ContextSupport() override;
   class GrContext* GrContext() override;
+  ContextCacheController* CacheController() override;
   void InvalidateGrContext(uint32_t state) override;
   base::Lock* GetLock() override;
-  void DeleteCachedResources() override;
   void SetLostContextCallback(const LostContextCallback& cb) override;
 
   TestWebGraphicsContext3D* TestContext3d();
@@ -75,6 +75,8 @@ class TestContextProvider : public ContextProvider {
   std::unique_ptr<TestContextSupport> support_;
   std::unique_ptr<TestWebGraphicsContext3D> context3d_;
   std::unique_ptr<TestGLES2Interface> context_gl_;
+  sk_sp<class GrContext> gr_context_;
+  std::unique_ptr<ContextCacheController> cache_controller_;
   bool bound_ = false;
 
   base::ThreadChecker main_thread_checker_;
@@ -83,7 +85,6 @@ class TestContextProvider : public ContextProvider {
   base::Lock context_lock_;
 
   LostContextCallback lost_context_callback_;
-  sk_sp<class GrContext> gr_context_;
 
   base::WeakPtrFactory<TestContextProvider> weak_ptr_factory_;