cc: Remove references to managed resources (and cleanup)

cc/resources/resource_provider.h

Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index df66372620cb6cb23deb653d73219caa08ae4738..7a0c8fe3aa4197114a6d64d48e72a4afa332345e 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -124,18 +124,11 @@ class CC_EXPORT ResourceProvider
 
   // Creates a resource for a particular texture target (the distinction between
   // texture targets has no effect in software mode).
-  ResourceId CreateManagedResource(const gfx::Size& size,
-                                   GLenum target,
-                                   TextureHint hint,
-                                   ResourceFormat format);
+  ResourceId CreateResourceWithTextureTarget(const gfx::Size& size,
+                                             GLenum target,
+                                             TextureHint hint,
+                                             ResourceFormat format);
 
-  // You can also explicitly create a specific resource type.
-  ResourceId CreateGLTexture(const gfx::Size& size,
-                             GLenum target,
-                             TextureHint hint,
-                             ResourceFormat format);
-
-  ResourceId CreateBitmap(const gfx::Size& size);
   // Wraps an IOSurface into a GL resource.
   ResourceId CreateResourceFromIOSurface(const gfx::Size& size,
                                          unsigned io_surface_id);
@@ -446,6 +439,13 @@ class CC_EXPORT ResourceProvider
                    const std::vector<unsigned>& use_image_texture_targets);
   void Initialize();
 
+  ResourceId CreateGLTexture(const gfx::Size& size,

[danakj, 2015/10/28 20:07:08]

You said private but these are protected, how come?

[ccameron, 2015/10/28 20:12:43]

Oop. Fxied.

+                             GLenum target,
+                             TextureHint hint,
+                             ResourceFormat format);
+
+  ResourceId CreateBitmap(const gfx::Size& size);
+
  private:
   struct Resource {
     enum Origin { INTERNAL, EXTERNAL, DELEGATED };