cc: Set the mapped memory reclaim limit for the renderer compositor on Android

cc/trees/layer_tree_host_unittest.cc

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 07c39a3d89a4cdbf54fafa1c6a1fc8c1d2acc870..1c239a37c8723232acb2996e94d85c3774ffdbab 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -63,6 +63,10 @@ namespace cc {
 namespace {
 
 class LayerTreeHostTest : public LayerTreeTest {
+ protected:
+  virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
+  }
 };
 
 // Two setNeedsCommits in a row should lead to at least 1 commit and at least 1
@@ -331,6 +335,7 @@ class LayerTreeHostTestNoExtraCommitFromInvalidate : public LayerTreeHostTest {
  public:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->layer_transforms_should_scale_layer_contents = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -386,6 +391,7 @@ class LayerTreeHostTestNoExtraCommitFromScrollbarInvalidate
  public:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->layer_transforms_should_scale_layer_contents = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -1119,6 +1125,7 @@ class LayerTreeHostTestDirectRendererAtomicCommit : public LayerTreeHostTest {
     settings->max_partial_texture_updates = 0;
     // Linear fade animator prevents scrollbars from drawing immediately.
     settings->use_linear_fade_scrollbar_animator = false;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -1297,6 +1304,7 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
     settings->max_partial_texture_updates = 1;
     // No partial updates when impl side painting is enabled.
     settings->impl_side_painting = false;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -1504,6 +1512,7 @@ class LayerTreeHostTestSurfaceNotAllocatedForLayersOutsideMemoryLimit
  protected:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->cache_render_pass_contents = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -2234,6 +2243,7 @@ class LayerTreeHostTestBeginFrameNotification : public LayerTreeHostTest {
  public:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->begin_frame_scheduling_enabled = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void BeginTest() OVERRIDE {
@@ -2263,6 +2273,7 @@ class LayerTreeHostTestBeginFrameNotificationShutdownWhileEnabled
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->begin_frame_scheduling_enabled = true;
     settings->using_synchronous_renderer_compositor = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
@@ -2287,6 +2298,7 @@ class LayerTreeHostTestUninvertibleTransformDoesNotBlockActivation
  protected:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->impl_side_painting = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -2840,6 +2852,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest
  protected:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->cache_render_pass_contents = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -3252,6 +3265,7 @@ class LayerTreeHostTestDeferredInitialize : public LayerTreeHostTest {
     // PictureLayer can only be used with impl side painting enabled.
     settings->impl_side_painting = true;
     settings->solid_color_scrollbars = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {
@@ -4376,6 +4390,7 @@ class LayerTreeHostTestUpdateLayerInEmptyViewport : public LayerTreeHostTest {
  protected:
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->impl_side_painting = true;
+    settings->max_bytes_pending_upload = 16 * 1024 * 1024;
   }
 
   virtual void SetupTree() OVERRIDE {