Move gpu memory calculations to Compositor.

content/common/gpu/gpu_memory_manager_unittest.cc

Index: content/common/gpu/gpu_memory_manager_unittest.cc
diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc
index 567ee25bf12cca61c721de123439bd8a496409d1..1a0fa831a855892071a7269d08fac9f2263ff603 100644
--- a/content/common/gpu/gpu_memory_manager_unittest.cc
+++ b/content/common/gpu/gpu_memory_manager_unittest.cc
@@ -107,11 +107,6 @@ class FakeClient : public GpuMemoryManagerClient {
     memory_tracker_ = NULL;
   }
 
-  void SetMemoryAllocation(const MemoryAllocation& alloc) override {
-    allocation_ = alloc;
-    ClientAssignmentCollector::AddClientStat(this, alloc);
-  }
-
   void SuggestHaveFrontBuffer(bool suggest_have_frontbuffer) override {
     suggest_have_frontbuffer_ = suggest_have_frontbuffer;
   }
@@ -192,12 +187,15 @@ class GpuMemoryManagerTest : public testing::Test {
   GpuMemoryManager memmgr_;
 };
 
+// Disabled, as gpumemorymanager doesnt do much work now.
+// TODO(sohanjg): Clean up as part of crbug.com/537563.

[piman, 2015/09/30 19:04:33]

Just delete all of them instead? They don't provide any value any more, and will
disappear anyway.

[sohanjg, 2015/10/01 07:14:13]

Done.

+
 // Test GpuMemoryManager::Manage basic functionality.
 // Expect memory allocation to set suggest_have_frontbuffer/backbuffer
 // according to visibility and last used time for stubs with surface.
 // Expect memory allocation to be shared according to share groups for stubs
 // without a surface.
-TEST_F(GpuMemoryManagerTest, TestManageBasicFunctionality) {
+TEST_F(GpuMemoryManagerTest, DISABLED_TestManageBasicFunctionality) {
   // Test stubs with surface.
   FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub2(&memmgr_, GenerateUniqueSurfaceId(), false);
@@ -227,7 +225,7 @@ TEST_F(GpuMemoryManagerTest, TestManageBasicFunctionality) {
 // according to visibility and last used time for stubs with surface.
 // Expect memory allocation to be shared according to share groups for stubs
 // without a surface.
-TEST_F(GpuMemoryManagerTest, TestManageChangingVisibility) {
+TEST_F(GpuMemoryManagerTest, DISABLED_TestManageChangingVisibility) {
   FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub2(&memmgr_, GenerateUniqueSurfaceId(), false);
 
@@ -255,7 +253,7 @@ TEST_F(GpuMemoryManagerTest, TestManageChangingVisibility) {
 // Test GpuMemoryManager::Manage functionality: Test more than threshold number
 // of visible stubs.
 // Expect all allocations to continue to have frontbuffer.
-TEST_F(GpuMemoryManagerTest, TestManageManyVisibleStubs) {
+TEST_F(GpuMemoryManagerTest, DISABLED_TestManageManyVisibleStubs) {
   FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub2(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub3(&memmgr_, GenerateUniqueSurfaceId(), true),
@@ -277,7 +275,7 @@ TEST_F(GpuMemoryManagerTest, TestManageManyVisibleStubs) {
 // Test GpuMemoryManager::Manage functionality: Test more than threshold number
 // of not visible stubs.
 // Expect the stubs surpassing the threshold to not have a backbuffer.
-TEST_F(GpuMemoryManagerTest, TestManageManyNotVisibleStubs) {
+TEST_F(GpuMemoryManagerTest, DISABLED_TestManageManyNotVisibleStubs) {
   FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub2(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub3(&memmgr_, GenerateUniqueSurfaceId(), true),
@@ -303,7 +301,7 @@ TEST_F(GpuMemoryManagerTest, TestManageManyNotVisibleStubs) {
 // Test GpuMemoryManager::Manage functionality: Test changing the last used
 // time of stubs when doing so causes change in which stubs surpass threshold.
 // Expect frontbuffer to be dropped for the older stub.
-TEST_F(GpuMemoryManagerTest, TestManageChangingLastUsedTime) {
+TEST_F(GpuMemoryManagerTest, DISABLED_TestManageChangingLastUsedTime) {
   FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub2(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub3(&memmgr_, GenerateUniqueSurfaceId(), true),
@@ -347,7 +345,7 @@ TEST_F(GpuMemoryManagerTest, TestManageChangingLastUsedTime) {
 // enough stubs so that every stub in share group crosses threshold.
 // Expect memory allocation of the stubs without surface to share memory
 // allocation with the most visible stub in share group.
-TEST_F(GpuMemoryManagerTest, TestManageChangingImportanceShareGroup) {
+TEST_F(GpuMemoryManagerTest, DISABLED_TestManageChangingImportanceShareGroup) {
   FakeClient stub_ignore_a(&memmgr_, GenerateUniqueSurfaceId(), true),
              stub_ignore_b(&memmgr_, GenerateUniqueSurfaceId(), false),
              stub_ignore_c(&memmgr_, GenerateUniqueSurfaceId(), false);