Reduce per-tab memory to 128M maximum, reduce default maximum across all tabs to 256M

content/common/gpu/gpu_memory_manager_unittest.cc

 // 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.
 
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_memory_allocation.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 141 matching lines @@
   }
 
   void Manage() {
     memory_manager_.Manage();
   }
 
   size_t GetAvailableGpuMemory() {
     return memory_manager_.GetAvailableGpuMemory();
   }
 
+  size_t GetMaximumTabAllocation() {
+    return memory_manager_.GetMaximumTabAllocation();
+  }
+
   size_t GetMinimumTabAllocation() {
     return memory_manager_.GetMinimumTabAllocation();
   }
 
   base::TimeTicks older_, newer_, newest_;
   FakeClient client_;
   GpuMemoryManager memory_manager_;
 };
 
 // Create fake stubs with every combination of {visibilty,last_use_time}
@@ skipping 460 matching lines @@
   Manage();
   stats = memory_manager_.stub_memory_stats_for_last_manage();
   size_t stub1allocation2 = stats[&stub1].allocation.gpu_resource_size_in_bytes;
   size_t stub2allocation2 = stats[&stub2].allocation.gpu_resource_size_in_bytes;
 
   EXPECT_EQ(stats.size(), 2ul);
   EXPECT_TRUE(stats[&stub1].visible);
   EXPECT_TRUE(stats[&stub2].visible);
   EXPECT_GT(stub1allocation2, 0ul);
   EXPECT_GT(stub2allocation2, 0ul);
-  if (compositors_get_bonus_allocation)
+  if (compositors_get_bonus_allocation &&
+      stub1allocation2 != GetMaximumTabAllocation())
     EXPECT_LT(stub1allocation2, stub1allocation1);
 
   FakeCommandBufferStub stub3(GenerateUniqueSurfaceId(), true, older_);
   client_.stubs_.push_back(&stub3);
   Manage();
   stats = memory_manager_.stub_memory_stats_for_last_manage();
   size_t stub1allocation3 = stats[&stub1].allocation.gpu_resource_size_in_bytes;
-  size_t stub2allocation3 = stats[&stub1].allocation.gpu_resource_size_in_bytes;
+  size_t stub2allocation3 = stats[&stub2].allocation.gpu_resource_size_in_bytes;
   size_t stub3allocation3 = stats[&stub3].allocation.gpu_resource_size_in_bytes;
 
   EXPECT_EQ(stats.size(), 3ul);
   EXPECT_TRUE(stats[&stub1].visible);
   EXPECT_TRUE(stats[&stub2].visible);
   EXPECT_TRUE(stats[&stub3].visible);
   EXPECT_GT(stub1allocation3, 0ul);
   EXPECT_GT(stub2allocation3, 0ul);
   EXPECT_GT(stub3allocation3, 0ul);
-  if (compositors_get_bonus_allocation)
+  if (compositors_get_bonus_allocation &&
+      stub1allocation3 != GetMaximumTabAllocation())
     EXPECT_LT(stub1allocation3, stub1allocation2);
 
   stub1.surface_state_.visible = false;
   Manage();
   stats = memory_manager_.stub_memory_stats_for_last_manage();
   size_t stub1allocation4 = stats[&stub1].allocation.gpu_resource_size_in_bytes;
   size_t stub2allocation4 = stats[&stub2].allocation.gpu_resource_size_in_bytes;
   size_t stub3allocation4 = stats[&stub3].allocation.gpu_resource_size_in_bytes;
 
   EXPECT_EQ(stats.size(), 3ul);
   EXPECT_FALSE(stats[&stub1].visible);
   EXPECT_FALSE(stats[&stub2].visible);
   EXPECT_TRUE(stats[&stub3].visible);
   EXPECT_EQ(stub1allocation4, 0ul);
   EXPECT_GE(stub2allocation4, 0ul);
   EXPECT_GT(stub3allocation4, 0ul);
-  if (compositors_get_bonus_allocation)
+  if (compositors_get_bonus_allocation &&
+      stub3allocation3 != GetMaximumTabAllocation())
     EXPECT_GT(stub3allocation4, stub3allocation3);
 }