Merge 158192 - cc: Remove TextureUploaderOption.

cc/CCScopedTextureTest.cpp

Index: cc/CCScopedTextureTest.cpp
===================================================================
--- cc/CCScopedTextureTest.cpp	(revision 160263)
+++ cc/CCScopedTextureTest.cpp	(working copy)
@@ -23,7 +23,7 @@
 {
     OwnPtr<CCGraphicsContext> context(createFakeCCGraphicsContext());
     DebugScopedSetImplThread implThread;
-    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));
+    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
     OwnPtr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
 
     // New scoped textures do not hold a texture yet.
@@ -38,7 +38,7 @@
 {
     OwnPtr<CCGraphicsContext> context(createFakeCCGraphicsContext());
     DebugScopedSetImplThread implThread;
-    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));
+    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
     OwnPtr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
     texture->allocate(CCRenderer::ImplPool, IntSize(30, 30), GraphicsContext3D::RGBA, CCResourceProvider::TextureUsageAny);
 
@@ -55,7 +55,7 @@
 {
     OwnPtr<CCGraphicsContext> context(createFakeCCGraphicsContext());
     DebugScopedSetImplThread implThread;
-    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));
+    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
 
     {
         OwnPtr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());
@@ -83,7 +83,7 @@
 {
     OwnPtr<CCGraphicsContext> context(createFakeCCGraphicsContext());
     DebugScopedSetImplThread implThread;
-    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get(), UnthrottledUploader));
+    OwnPtr<CCResourceProvider> resourceProvider(CCResourceProvider::create(context.get()));
 
     {
         OwnPtr<CCScopedTexture> texture = CCScopedTexture::create(resourceProvider.get());