Revert of fold AnalysisDevice functionality into AnalysisCanvas, to simplify setup and to allow Skia to depre… (https://codereview.chromium.org/136003012/)

Reason for revert:
Likely broke several unit tests: http://build.chromium.org/p/chromium.mac/builders/Mac%2010.7%20Tests%20%28dbg%29%281%29/builds/21083

AnalyzeIsSolidEmpty
AnalyzeIsSolidScaled
AnalyzeIsSolidUnscaled

Original issue's description:
> fold AnalysisDevice functionality into AnalysisCanvas, to simplify setup and to allow Skia to deprecate access to SkDevice
> 
> BUG=skia:1931
> R=enne@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=253240

TBR=enne@chromium.org,reed@chromium.org,reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1931

Review URL: https://codereview.chromium.org/178503003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253247 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/cc/debug/rasterize_and_record_benchmark_impl.cc b/cc/debug/rasterize_and_record_benchmark_impl.cc
index 9c997ce..15cfd7a 100644
--- a/cc/debug/rasterize_and_record_benchmark_impl.cc
+++ b/cc/debug/rasterize_and_record_benchmark_impl.cc
@@ -110,10 +110,13 @@ void RasterizeAndRecordBenchmarkImpl::RunOnLayer(PictureLayerImpl* layer) {
     bool is_solid_color = false;
     for (int i = 0; i < rasterize_repeat_count_; ++i) {
       SkBitmap bitmap;
-      bitmap.allocPixels(SkImageInfo::MakeN32Premul(content_rect.width(),
-                                                    content_rect.height()));
+      bitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                       content_rect.width(),
+                       content_rect.height());
+      bitmap.allocPixels();
 
-      SkCanvas canvas(bitmap);
+      SkBitmapDevice device(bitmap);
+      SkCanvas canvas(&device);
       PicturePileImpl::Analysis analysis;
 
       base::TimeTicks start = Now();