Revert of Modifying TextBlobCacheTest to use SkRandomScalerContext

src/gpu/GrBatchAtlas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBatchAtlas.h"
 #include "GrBatchTarget.h"
 #include "GrGpu.h"
@@ skipping 24 matching lines @@
     typedef GrBatchAtlas::BatchToken BatchToken;
     
     SK_DECLARE_INTERNAL_LLIST_INTERFACE(BatchPlot);
 
     // index() refers to the index of the plot in the owning GrAtlas's plot array.  genID() is a
     // monotonically incrementing number which is bumped every time the cpu backing store is
     // wiped, or when the plot itself is evicted from the atlas(ie, there is continuity in genID()
     // across atlas spills)
     int index() const { return fIndex; }
     int genID() const { return fGenID; }
-    GrBatchAtlas::AtlasID id() {
-        SkASSERT(GrBatchAtlas::kInvalidAtlasID != fID);
-        return fID;
-    }
+    GrBatchAtlas::AtlasID id() { return fID; }
 
     GrTexture* texture() const { return fTexture; }
 
     bool addSubImage(int width, int height, const void* image, SkIPoint16* loc, size_t rowBytes)  {
         if (!fRects->addRect(width, height, loc)) {
             return false;
         }
 
         if (!fData) {
             fData = reinterpret_cast<unsigned char*>(sk_calloc_throw(fBytesPerPixel * fWidth *
@@ skipping 310 matching lines @@
 }
 
 void GrBatchAtlas::setLastUseTokenBulk(const BulkUseTokenUpdater& updater, BatchToken batchToken) {
     int count = updater.fPlotsToUpdate.count();
     for (int i = 0; i < count; i++) {
         BatchPlot* plot = fPlotArray[updater.fPlotsToUpdate[i]];
         this->makeMRU(plot);
         plot->setLastUseToken(batchToken);
     }
 }