cc: Remove SetMemoryPolicy from OutputSurface and Display.

blimp/client/support/compositor/blimp_layer_tree_settings.cc

 // Copyright 2015 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 "blimp/client/support/compositor/blimp_layer_tree_settings.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 83 matching lines @@
   settings->scrollbar_fade_resize_delay_ms = 500;
   settings->scrollbar_fade_duration_ms = 300;
 
 // When pinching in, only show the pinch-viewport overlay scrollbars if the
 // page scale is at least some threshold away from the minimum. i.e. don't
 // show the pinch scrollbars when at minimum scale.
 // TODO(dtrainor): Update this since https://crrev.com/1267603004 landed.
 // settings->scrollbar_show_scale_threshold = 1.05f;
 #endif
 
-  // Set the GpuMemoryPolicy.
-  cc::ManagedMemoryPolicy memory_policy = settings->memory_policy_;
+  // Set the gpu memory policy.
+  cc::ManagedMemoryPolicy& memory_policy = settings->gpu_memory_policy;
   memory_policy.bytes_limit_when_visible = 0;
 
 #if defined(OS_ANDROID)
   // We can't query available GPU memory from the system on Android.
   // Physical memory is also mis-reported sometimes (eg. Nexus 10 reports
   // 1262MB when it actually has 2GB, while Razr M has 1GB but only reports
   // 128MB java heap size). First we estimate physical memory using both.
   size_t dalvik_mb = base::SysInfo::DalvikHeapSizeMB();
   size_t physical_mb = base::SysInfo::AmountOfPhysicalMemoryMB();
   size_t physical_memory_mb = 0;
@@ skipping 96 matching lines @@
 #endif
   settings->default_tile_size.SetSize(default_tile_size, default_tile_size);
 
   settings->renderer_settings.buffer_to_texture_target_map =
       BlimpGpuMemoryBufferManager::GetDefaultBufferToTextureTargetMap();
   settings->use_output_surface_begin_frame_source = true;
 }
 
 }  // namespace client
 }  // namespace blimp