Remove all uses of skia::RefPtr and stale includes

ui/gfx/skbitmap_operations.cc

 // Copyright (c) 2012 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 "ui/gfx/skbitmap_operations.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 #include <algorithm>
 
 #include "base/logging.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
+#include "third_party/skia/include/core/SkRefCnt.h"

[f(malita), 2016/05/04 15:49:58]

Nit: I don't think we handle sk_sps explicitly in this file, so we probably
don't need this header.

[tomhudson, 2016/05/04 16:51:54]

Done. (At one intermediate stage we had sk_sp<SkImageFilter>, but yeah, style
says fold that into the setter when possible and I was able to here.)

 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 
 // static
 SkBitmap SkBitmapOperations::CreateInvertedBitmap(const SkBitmap& image) {
   DCHECK(image.colorType() == kN32_SkColorType);
 
@@ skipping 705 matching lines @@
 
   SkPaint paint;
   for (size_t i = 0; i < shadows.size(); ++i) {
     const gfx::ShadowValue& shadow = shadows[i];
     SkBitmap shadow_image = SkBitmapOperations::CreateColorMask(bitmap,
                                                                 shadow.color());
 
     // The blur is halved to produce a shadow that correctly fits within the
     // |shadow_margin|.
     SkScalar sigma = SkDoubleToScalar(shadow.blur() / 2);
-    skia::RefPtr<SkImageFilter> filter =
-        skia::AdoptRef(SkBlurImageFilter::Create(sigma, sigma));
-    paint.setImageFilter(filter.get());
+    paint.setImageFilter(SkBlurImageFilter::Make(sigma, sigma, nullptr));
 
     canvas.saveLayer(0, &paint);
     canvas.drawBitmap(shadow_image,
                       SkIntToScalar(shadow.x()),
                       SkIntToScalar(shadow.y()));
     canvas.restore();
   }
 
   canvas.drawBitmap(bitmap, SkIntToScalar(0), SkIntToScalar(0));
   return image_with_shadow;
@@ skipping 29 matching lines @@
   canvas.translate(SkFloatToScalar(result.width() * 0.5f),
                    SkFloatToScalar(result.height() * 0.5f));
   canvas.rotate(angle);
   canvas.translate(-SkFloatToScalar(source.width() * 0.5f),
                    -SkFloatToScalar(source.height() * 0.5f));
   canvas.drawBitmap(source, 0, 0);
   canvas.flush();
 
   return result;
 }