Roll Chrome into Mojo.

cc/resources/resource_pool.h

Index: cc/resources/resource_pool.h
diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h
index 72467c90ebfdb116a30e823b4b57f6c2d79377e5..f79455905dd4513deb491b250a723b445c593d38 100644
--- a/cc/resources/resource_pool.h
+++ b/cc/resources/resource_pool.h
@@ -19,11 +19,8 @@ class ScopedResource;
 class CC_EXPORT ResourcePool {
  public:
   static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
-                                         GLenum target,
-                                         ResourceFormat default_format) {
-    return make_scoped_ptr(new ResourcePool(resource_provider,
-                                            target,
-                                            default_format));
+                                         GLenum target) {
+    return make_scoped_ptr(new ResourcePool(resource_provider, target));
   }
 
   virtual ~ResourcePool();
@@ -52,12 +49,8 @@ class CC_EXPORT ResourcePool {
   }
   size_t busy_resource_count() const { return busy_resources_.size(); }
 
-  ResourceFormat default_format() const { return default_format_; }
-
  protected:
-  ResourcePool(ResourceProvider* resource_provider,
-               GLenum target,
-               ResourceFormat default_format);
+  ResourcePool(ResourceProvider* resource_provider, GLenum target);
 
   bool ResourceUsageTooHigh();
 
@@ -66,9 +59,6 @@ class CC_EXPORT ResourcePool {
 
   ResourceProvider* resource_provider_;
   const GLenum target_;
-  // TODO(peterp): Remove the format state and let the clients keep track of
-  // this instead.
-  const ResourceFormat default_format_;
   size_t max_memory_usage_bytes_;
   size_t max_unused_memory_usage_bytes_;
   size_t max_resource_count_;