cc: Never block on uploads from previous frame and increase max pending uploads.

cc/test/CCTiledLayerTestCommon.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CCTiledLayerTestCommon_h
 #define CCTiledLayerTestCommon_h
 
 #include "CCGraphicsContext.h"
 #include "CCPrioritizedTexture.h"
 #include "CCResourceProvider.h"
@@ skipping 112 matching lines @@
     void setContentBounds(const cc::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
     virtual cc::IntSize contentBounds() const OVERRIDE;
 
 protected:
     cc::IntSize m_forcedContentBounds;
 };
 
 
 class FakeTextureUploader : public cc::TextureUploader {
 public:
-    virtual size_t numPendingUploads() OVERRIDE;
+    virtual size_t numBlockingUploads() OVERRIDE;
+    virtual void markPendingUploadsAsNonBlocking() OVERRIDE;
     virtual double estimatedTexturesPerSecond() OVERRIDE;
     virtual void beginUploads() OVERRIDE { }
     virtual void endUploads() OVERRIDE { }
     virtual void uploadTexture(cc::CCResourceProvider*, Parameters upload) OVERRIDE;
 };
 
 }
 #endif // CCTiledLayerTestCommon_h