Revert of Move gpu memory calculations to Compositor.

cc/output/output_surface.cc

 // Copyright (c) 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 "cc/output/output_surface.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 198 matching lines @@
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
   bool success = true;
 
   if (context_provider_.get()) {
     success = context_provider_->BindToCurrentThread();
     if (success) {
       context_provider_->SetLostContextCallback(base::Bind(
           &OutputSurface::DidLoseOutputSurface, base::Unretained(this)));
+      context_provider_->SetMemoryPolicyChangedCallback(
+          base::Bind(&OutputSurface::SetMemoryPolicy, base::Unretained(this)));
     }
   }
 
   if (!success)
     client_ = NULL;
 
   // In certain cases, ThreadTaskRunnerHandle isn't set (Android Webview).
   // Don't register a dump provider in these cases.
   // TODO(ericrk): Get this working in Android Webview. crbug.com/517156
   if (client_ && base::ThreadTaskRunnerHandle::IsSet()) {
@@ skipping 127 matching lines @@
   DCHECK(client_);
 
   // Unregister any dump provider. Safe to call (no-op) if we have not yet
   // registered.
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
 
   if (context_provider_.get()) {
     context_provider_->SetLostContextCallback(
         ContextProvider::LostContextCallback());
+    context_provider_->SetMemoryPolicyChangedCallback(
+        ContextProvider::MemoryPolicyChangedCallback());
   }
   context_provider_ = nullptr;
   client_ = nullptr;
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace cc