Upstream ResourceManager

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index c070ac55ada82a890882fa2abaec7b796bf8d473..6da1273a8063331b836b505efd0ffc785dfa8076 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -165,8 +165,9 @@ bool CompositorImpl::IsInitialized() {
 CompositorImpl::CompositorImpl(CompositorClient* client,
                                gfx::NativeWindow root_window)
     : root_layer_(cc::Layer::Create()),
+      resource_manager_(&ui_resource_provider_),
       surface_id_allocator_(
-        new cc::SurfaceIdAllocator(++g_surface_id_namespace)),
+          new cc::SurfaceIdAllocator(++g_surface_id_namespace)),
       has_transparent_background_(false),
       device_scale_factor_(1),
       window_(NULL),
@@ -322,6 +323,10 @@ UIResourceProvider& CompositorImpl::GetUIResourceProvider() {
   return ui_resource_provider_;
 }
 
+ui::ResourceManager& CompositorImpl::GetResourceManager() {
+  return resource_manager_;
+}
+
 ui::SystemUIResourceManager& CompositorImpl::GetSystemUIResourceManager() {
   return ui_resource_provider_.GetSystemUIResourceManager();
 }