Revert 181950 - Broke content_unittests on Android

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_memory_allocation.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_memory_manager_client.h"
 #include "content/common/gpu/gpu_memory_tracking.h"
 #include "ui/gfx/size_conversions.h"
 
@@ skipping 906 matching lines @@
   // Background stubs 1 and 2, and they should fit. All stubs should
   // have their full nicetohave budget should they become visible.
   stub2.SetVisible(false);
   stub1.SetVisible(false);
   Manage();
   EXPECT_GE(stub1.BytesWhenVisible(), 23u);
   EXPECT_GE(stub2.BytesWhenVisible(), 23u);
   EXPECT_GE(stub3.BytesWhenVisible(), 23u);
   EXPECT_LT(stub1.BytesWhenVisible(), 32u);
   EXPECT_LT(stub2.BytesWhenVisible(), 32u);
+  EXPECT_LT(stub3.BytesWhenVisible(), 32u);
   EXPECT_GE(stub1.BytesWhenNotVisible(), 6u);
   EXPECT_GE(stub2.BytesWhenNotVisible(), 6u);
   EXPECT_GE(stub3.BytesWhenNotVisible(), 6u);
 
   // Now background stub 3, and it should cause stub 2 to be
   // evicted because it was set non-visible first
   stub3.SetVisible(false);
   Manage();
   EXPECT_GE(stub1.BytesWhenNotVisible(), 6u);
   EXPECT_EQ(stub2.BytesWhenNotVisible(), 0u);
@@ skipping 96 matching lines @@
 TEST_F(GpuMemoryManagerTestNonuniform, DefaultAllocation) {
   // Set memory manager constants for this test
   memmgr_.TestingSetUseNonuniformMemoryPolicy(true);
   memmgr_.TestingSetAvailableGpuMemory(64);
   memmgr_.TestingSetNonvisibleAvailableGpuMemory(16);
   memmgr_.TestingSetMinimumClientAllocation(8);
   memmgr_.TestingSetDefaultClientAllocation(16);
 
   FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true);
 
-  // Expect that a client which has not sent stats receive at
-  // least the default allocation.
+  // Expect that a client which has not sent stats receive the
+  // default allocation.
   Manage();
-  EXPECT_GE(stub1.BytesWhenVisible(),
+  EXPECT_EQ(stub1.BytesWhenVisible(),
             memmgr_.GetDefaultClientAllocation());
   EXPECT_EQ(stub1.BytesWhenNotVisible(), 0u);
 }
 
 }  // namespace content