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 bcdf99cde87f7a8fd4b56515e98c63a8958cfec9..9e6c38f6a9143fe7bf6cde92ea8c87a7e83f0d42 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -190,9 +190,12 @@ CompositorImpl::CompositorImpl(CompositorClient* client,
   DCHECK(root_window);
   ImageTransportFactoryAndroid::AddObserver(this);
   root_window->AttachCompositor(this);
+  resource_manager_.reset(
+      new content::ResourceManagerImpl(&ui_resource_provider_));
 }
 
 CompositorImpl::~CompositorImpl() {
+  resource_manager_.reset(nullptr);
   root_window_->DetachCompositor();
   ImageTransportFactoryAndroid::RemoveObserver(this);
   // Clean-up any surface references.
@@ -318,6 +321,10 @@ UIResourceProvider& CompositorImpl::GetUIResourceProvider() {
   return ui_resource_provider_;
 }
 
+ResourceManager* CompositorImpl::GetResourceManager() {
+  return resource_manager_.get();
+}
+
 ui::SystemUIResourceManager& CompositorImpl::GetSystemUIResourceManager() {
   return ui_resource_provider_.GetSystemUIResourceManager();
 }