Upstream ResourceManager

content/browser/renderer_host/compositor_impl_android.h

Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 402271b1084e786329e02e6454c7d36784cc75d6..607c020ce95cf02b68f6f9f0947af70a69478138 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -12,6 +12,7 @@
 #include "base/memory/weak_ptr.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_host_single_thread_client.h"
+#include "content/browser/android/resource_manager_impl.h"
 #include "content/browser/android/ui_resource_provider_impl.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/common/content_export.h"
@@ -32,6 +33,7 @@ class LayerTreeHost;
 
 namespace content {
 class CompositorClient;
+class ResourceManager;
 class UIResourceProvider;
 
 // -----------------------------------------------------------------------------
@@ -61,6 +63,7 @@ class CONTENT_EXPORT CompositorImpl
   virtual void SetHasTransparentBackground(bool flag) override;
   virtual void SetNeedsComposite() override;
   virtual UIResourceProvider& GetUIResourceProvider() override;
+  virtual ResourceManager* GetResourceManager() override;
 
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) override {}
@@ -141,6 +144,7 @@ class CONTENT_EXPORT CompositorImpl
 
   scoped_ptr<cc::LayerTreeHost> host_;
   content::UIResourceProviderImpl ui_resource_provider_;
+  scoped_ptr<content::ResourceManagerImpl> resource_manager_;
 
   gfx::Size size_;
   bool has_transparent_background_;