Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

cc/resources/raster_worker_pool_unittest.cc

 // Copyright 2013 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.
 
 #include "cc/resources/raster_worker_pool.h"
 
 #include <vector>
 
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/resources/image_raster_worker_pool.h"
@@ skipping 16 matching lines @@
 
   TestRasterWorkerPoolTaskImpl(
       const Resource* resource,
       const Reply& reply,
       TaskVector* dependencies)
       : internal::RasterWorkerPoolTask(resource, dependencies),
         reply_(reply),
         did_raster_(false) {}
 
   // Overridden from internal::WorkerPoolTask:
-  virtual bool RunOnWorkerThread(SkDevice* device, unsigned thread_index)
+  virtual bool RunOnWorkerThread(SkBaseDevice* device, unsigned thread_index)
       OVERRIDE {
     did_raster_ = true;
     return true;
   }
   virtual void CompleteOnOriginThread() OVERRIDE {
     reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning(), did_raster_);
   }
 
  protected:
   virtual ~TestRasterWorkerPoolTaskImpl() {}
@@ skipping 229 matching lines @@
     ASSERT_EQ(1u, tasks_.size());
     tasks_.clear();
   }
 };
 
 PIXEL_BUFFER_AND_IMAGE_TEST_F(RasterWorkerPoolTestFailedMapResource);
 
 }  // namespace
 
 }  // namespace cc