Revert of Move gpu memory calculations to Compositor.

cc/output/output_surface.cc

Index: cc/output/output_surface.cc
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index e7c4e9310d087f15cc93e3adf41dae06d212c49f..38b13463c1b7dac5ed8a519161c30e456033a790 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -216,6 +216,8 @@ bool OutputSurface::BindToClient(OutputSurfaceClient* client) {
     if (success) {
       context_provider_->SetLostContextCallback(base::Bind(
           &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
+      context_provider_->SetMemoryPolicyChangedCallback(
+          base::Bind(&OutputSurface::SetMemoryPolicy, base::Unretained(this)));
     }
   }
 
@@ -363,6 +365,8 @@ void OutputSurface::DetachFromClientInternal() {
   if (context_provider_.get()) {
     context_provider_->SetLostContextCallback(
         ContextProvider::LostContextCallback());
+    context_provider_->SetMemoryPolicyChangedCallback(
+        ContextProvider::MemoryPolicyChangedCallback());
   }
   context_provider_ = nullptr;
   client_ = nullptr;