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 0d834458d16f39c335c6a3a03719dfdaa846b946..67f5d5d055cdf024fae472f8af26e301ee3a78e9 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -18,6 +18,7 @@
 #include "content/public/browser/android/compositor.h"
 #include "gpu/command_buffer/common/capabilities.h"
 #include "third_party/khronos/GLES2/gl2.h"
+#include "ui/android/resources/resource_manager.h"
 #include "ui/base/android/system_ui_resource_manager.h"
 #include "ui/base/android/window_android_compositor.h"
 
@@ -61,6 +62,7 @@ class CONTENT_EXPORT CompositorImpl
   virtual void SetHasTransparentBackground(bool flag) override;
   virtual void SetNeedsComposite() override;
   virtual UIResourceProvider& GetUIResourceProvider() override;
+  virtual ui::ResourceManager& GetResourceManager() override;
 
   // LayerTreeHostClient implementation.
   virtual void WillBeginMainFrame(int frame_id) override {}
@@ -139,6 +141,7 @@ class CONTENT_EXPORT CompositorImpl
 
   scoped_ptr<cc::LayerTreeHost> host_;
   content::UIResourceProviderImpl ui_resource_provider_;
+  ui::ResourceManager resource_manager_;
 
   scoped_ptr<OnscreenDisplayClient> display_client_;
   scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;