Merge 158192 - cc: Remove TextureUploaderOption.

cc/CCLayerTreeHostImpl.cpp

Index: cc/CCLayerTreeHostImpl.cpp
===================================================================
--- cc/CCLayerTreeHostImpl.cpp	(revision 160263)
+++ cc/CCLayerTreeHostImpl.cpp	(working copy)
@@ -678,7 +678,7 @@
     setBackgroundTickingEnabled(!m_visible && m_needsAnimateLayers);
 }
 
-bool CCLayerTreeHostImpl::initializeRenderer(PassOwnPtr<CCGraphicsContext> context, TextureUploaderOption textureUploader)
+bool CCLayerTreeHostImpl::initializeRenderer(PassOwnPtr<CCGraphicsContext> context)
 {
     if (!context->bindToClient(this))
         return false;
@@ -691,7 +691,7 @@
     }
 
     OwnPtr<CCGraphicsContext> contextRef(context);
-    OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(contextRef.get(), textureUploader);
+    OwnPtr<CCResourceProvider> resourceProvider = CCResourceProvider::create(contextRef.get());
     OwnPtr<CCRendererGL> renderer;
     if (resourceProvider.get())
         renderer = CCRendererGL::create(this, resourceProvider.get());