Revert 134480 - Revert 134428 - GpuMemoryManager suggests values for renderer Contents Texture Mana…

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

Index: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
===================================================================
--- content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc	(revision 134525)
+++ content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc	(working copy)
@@ -264,10 +264,6 @@
     g_all_shared_contexts.Pointer()->insert(this);
   }
 
-  command_buffer_->SetMemoryAllocationChangedCallback(base::Bind(
-      &WebGraphicsContext3DCommandBufferImpl::OnMemoryAllocationChanged,
-      weak_ptr_factory_.GetWeakPtr()));
-
   visible_ = true;
   initialized_ = true;
   return true;
@@ -680,6 +676,14 @@
     setMemoryAllocationChangedCallbackCHROMIUM(
         WebGraphicsMemoryAllocationChangedCallbackCHROMIUM* callback) {
   memory_allocation_changed_callback_ = callback;
+
+  if (callback)
+    command_buffer_->SetMemoryAllocationChangedCallback(base::Bind(
+        &WebGraphicsContext3DCommandBufferImpl::OnMemoryAllocationChanged,
+        weak_ptr_factory_.GetWeakPtr()));
+  else
+    command_buffer_->SetMemoryAllocationChangedCallback(
+        base::Callback<void(const GpuMemoryAllocationForRenderer&)>());
 }