Revert of Move gpu memory calculations to Compositor.

content/common/gpu/gpu_memory_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 94 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(GpuMemoryManagerTest,
                            DefaultAllocation);
 
   typedef std::map<gpu::gles2::MemoryTracker*, GpuMemoryTrackingGroup*>
       TrackingGroupMap;
 
   typedef std::list<GpuMemoryManagerClientState*> ClientStateList;
 
   void Manage();
   void SetClientsHibernatedState() const;
+  void AssignSurfacesAllocations();
+  void AssignNonSurfacesAllocations();
+
+  // Update the amount of GPU memory we think we have in the system, based
+  // on what the stubs' contexts report.
+  void UpdateAvailableGpuMemory();
 
   // Send memory usage stats to the browser process.
   void SendUmaStatsToBrowser();
 
   // Get the current number of bytes allocated.
   uint64 GetCurrentUsage() const {
     return bytes_allocated_current_;
   }
 
   // GpuMemoryTrackingGroup interface
@@ skipping 43 matching lines @@
   // The current total memory usage, and historical maximum memory usage
   uint64 bytes_allocated_current_;
   uint64 bytes_allocated_historical_max_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_