Update from https://crrev.com/306655

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 60 matching lines @@
   skia::AnalysisCanvas canvas(255, 255);
 
   // Draw paint test.
   SkColor color = SkColorSetARGB(255, 11, 22, 33);
   SkPaint paint;
   paint.setColor(color);
 
   canvas.drawPaint(paint);
 
   SkColor outputColor;
-  //TODO(vmpstr): This should return true. (crbug.com/180597)
-  EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
+  EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor));
 
   // Draw points test.
   SkPoint points[4] = {
     SkPoint::Make(0, 0),
     SkPoint::Make(255, 0),
     SkPoint::Make(255, 255),
     SkPoint::Make(0, 255)
   };
 
   SolidColorFill(canvas);
@@ skipping 254 matching lines @@
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   canvas.restore();
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 
   SolidColorFill(canvas);
   EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor));
 }
 
 }  // namespace skia