Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Unified Diff: content/common/gpu/gpu_memory_manager_unittest.cc

Issue 12208134: Revert 181950 - Broke content_unittests on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_memory_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_memory_manager_unittest.cc
===================================================================
--- content/common/gpu/gpu_memory_manager_unittest.cc (revision 181961)
+++ content/common/gpu/gpu_memory_manager_unittest.cc (working copy)
@@ -924,6 +924,7 @@
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);
@@ -1040,10 +1041,10 @@
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);
}
« no previous file with comments | « content/common/gpu/gpu_memory_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698