Index: cc/trees/layer_tree_host_unittest.cc |
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc |
index 8d554dcf0c942426f45c6811b4937ea4dffd6e72..7c6ed82354bebd5755a614f9ac1a28326f8f9e9a 100644 |
--- a/cc/trees/layer_tree_host_unittest.cc |
+++ b/cc/trees/layer_tree_host_unittest.cc |
@@ -2094,10 +2094,8 @@ class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted |
layer_tree_host()->contents_texture_manager()->MemoryUseBytes()); |
// Set a new policy that will kick out 1 of the 3 resources. |
// Because a resource was evicted, a commit will be kicked off. |
- host_impl->SetMemoryPolicy( |
- ManagedMemoryPolicy(100 * 100 * 4 * 2, |
- gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING, |
- 1000)); |
+ host_impl->SetMemoryPolicy(ManagedMemoryPolicy( |
+ 100 * 100 * 4 * 2, gpu::MemoryAllocation::CUTOFF_ALLOW_EVERYTHING)); |
break; |
case 2: |
// Only two backings should have memory. |
@@ -4294,16 +4292,14 @@ class LayerTreeHostTestMemoryLimits : public LayerTreeHostTest { |
// This will trigger a commit because the priority cutoff has changed. |
impl->SetMemoryPolicy(ManagedMemoryPolicy( |
16u * 1024u * 1024u, |
- gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE, |
- 1000)); |
+ gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE)); |
break; |
case 3: |
// This will not trigger a commit because the priority cutoff has not |
// changed, and there is already enough memory for all allocations. |
impl->SetMemoryPolicy(ManagedMemoryPolicy( |
32u * 1024u * 1024u, |
- gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE, |
- 1000)); |
+ gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE)); |
break; |
case 4: |
NOTREACHED(); |
@@ -4349,8 +4345,7 @@ class LayerTreeHostTestSetMemoryPolicyOnLostOutputSurface |
make_scoped_ptr(new ManagedMemoryPolicy( |
second_context_provider_.get() ? second_output_surface_memory_limit_ |
: first_output_surface_memory_limit_, |
- gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE, |
- ManagedMemoryPolicy::kDefaultNumResourcesLimit))); |
+ gpu::MemoryAllocation::CUTOFF_ALLOW_NICE_TO_HAVE))); |
return output_surface.Pass(); |
} |