Update from https://crrev.com/311076

skia/ext/analysis_canvas_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 "base/compiler_specific.h"
 #include "skia/ext/analysis_canvas.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ skipping 181 matching lines @@
 }
 
 TEST(AnalysisCanvasTest, ClipPath) {
   skia::AnalysisCanvas canvas(255, 255);
 
   // Skia will look for paths that are actually rects and treat
   // them as such. We add a divot to the following path to prevent
   // this optimization and truly test clipPath's behavior.
   SkPath path;
   path.moveTo(0, 0);
-  path.lineTo(128, 50); 
+  path.lineTo(128, 50);
   path.lineTo(255, 0);
   path.lineTo(255, 255);
   path.lineTo(0, 255);
 
   SkColor outputColor;
   SolidColorFill(canvas);
   canvas.clipPath(path);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   canvas.save();
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   canvas.clipPath(path);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   canvas.restore();
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   SolidColorFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 }
 
 TEST(AnalysisCanvasTest, SaveLayerRestore) {
   skia::AnalysisCanvas canvas(255, 255);
 
   SkColor outputColor;
   SolidColorFill(canvas);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
-  
+
   SkRect bounds = SkRect::MakeWH(255, 255);
   SkPaint paint;
   paint.setColor(SkColorSetARGB(255, 255, 255, 255));
   paint.setXfermodeMode(SkXfermode::kSrcOver_Mode);
 
   // This should force non-transparency
   canvas.saveLayer(&bounds, &paint);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 
   TransparentFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   SolidColorFill(canvas);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 
   paint.setXfermodeMode(SkXfermode::kDst_Mode);
 
   // This should force non-solid color
   canvas.saveLayer(&bounds, &paint);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   TransparentFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   SolidColorFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
-  
+
   canvas.restore();
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   TransparentFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   SolidColorFill(canvas);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 
   canvas.restore();
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 
   TransparentFill(canvas);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 
   SolidColorFill(canvas);
   EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
   EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor);
 }
 
 TEST(AnalysisCanvasTest, EarlyOutNotSolid) {
-  SkTileGridFactory::TileGridInfo tile_grid_info;
-  tile_grid_info.fTileInterval.set(256, 256);
-  tile_grid_info.fOffset.setZero();
-  tile_grid_info.fMargin.setEmpty();
-  SkTileGridFactory factory(tile_grid_info);
+  SkRTreeFactory factory;
   SkPictureRecorder recorder;
 
   // Create a picture with 3 commands, last of which is non-solid.
   skia::RefPtr<SkCanvas> record_canvas =
       skia::SharePtr(recorder.beginRecording(256, 256, &factory));
 
   std::string text = "text";
   SkPoint point = SkPoint::Make(SkIntToScalar(25), SkIntToScalar(25));
 
   SkPaint paint;
@@ skipping 46 matching lines @@
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   canvas.restore();
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   SolidColorFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 }
 
 }  // namespace skia