Merge 158192 - cc: Remove TextureUploaderOption.

cc/CCResourceProvider.h

Index: cc/CCResourceProvider.h
===================================================================
--- cc/CCResourceProvider.h	(revision 160263)
+++ cc/CCResourceProvider.h	(working copy)
@@ -26,8 +26,6 @@
 
 namespace cc {
 
-enum TextureUploaderOption { ThrottledUploader, UnthrottledUploader };
-
 class IntRect;
 class LayerTextureSubImage;
 class TextureCopier;
@@ -61,7 +59,7 @@
         unsigned syncPoint;
     };
 
-    static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*, TextureUploaderOption);
+    static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*);
 
     virtual ~CCResourceProvider();
 
@@ -264,7 +262,7 @@
     typedef HashMap<int, Child> ChildMap;
 
     explicit CCResourceProvider(CCGraphicsContext*);
-    bool initialize(TextureUploaderOption);
+    bool initialize();
 
     const Resource* lockForRead(ResourceId);
     void unlockForRead(ResourceId);