Replace SkTLazy with base::Optional

skia/ext/benchmarking_canvas.cc

Index: skia/ext/benchmarking_canvas.cc
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index 1160b18cb77299841a2ce194880feb82096ad5b1..7ad497c4c686507fd4884658e7cac3c7467e095c 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "base/logging.h"
+#include "base/optional.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
@@ -18,7 +19,6 @@
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkString.h"
-#include "third_party/skia/include/core/SkTLazy.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 
@@ -474,9 +474,14 @@ public:
     if (canvas->flags_ & kOverdrawVisualization_Flag) {
       DCHECK(canvas->overdraw_xfermode_);
 
-      paint_ = paint ? filtered_paint_.set(*paint) : filtered_paint_.init();
-      filtered_paint_.get()->setXfermode(canvas->overdraw_xfermode_);
-      filtered_paint_.get()->setAntiAlias(false);
+      if (paint) {
+        filtered_paint_ = *paint;
+      } else {
+        filtered_paint_.emplace();
+      }
+      paint_ = &(*filtered_paint_);

[danakj, 2016/04/27 18:27:52]

nit: no ()

not seeing the point of the paint_ member. seems like filtered_paint_ is enough.
can you remove the paint_ member?

Why is it using optional here at all? Why not just an SkPaint member, and we
override it with |*paint| if one is given? Do we really care so much about not
initializing the SkPaint if we'll use |*paint|?

+      filtered_paint_->setXfermode(canvas->overdraw_xfermode_);
+      filtered_paint_->setAntiAlias(false);
     }
 
     start_ticks_ = base::TimeTicks::Now();
@@ -505,7 +510,7 @@ private:
   base::TimeTicks start_ticks_;
 
   const SkPaint* paint_;
-  SkTLazy<SkPaint> filtered_paint_;
+  base::Optional<SkPaint> filtered_paint_;
 };
 
 BenchmarkingCanvas::BenchmarkingCanvas(SkCanvas* canvas, unsigned flags)