Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR

chrome/browser/ui/extensions/icon_with_badge_image_source.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 "chrome/browser/ui/extensions/icon_with_badge_image_source.h"
 
 #include <algorithm>
 #include <cmath>
 #include <utility>
 
@@ skipping 64 matching lines @@
     // typeface will be NULL. If we don't do manual fallback then we'll crash.
     if (typeface) {
       text_paint->setFakeBoldText(true);
     } else {
       // Fall back to the system font. We don't bold it because we aren't sure
       // how it will look.
       // For the most part this code path will only be hit on Linux systems
       // that don't have Arial.
       ResourceBundle& rb = ResourceBundle::GetSharedInstance();
       const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
-      typeface = sk_sp<SkTypeface>(SkTypeface::MakeFromName(
-          base_font.GetFontName().c_str(), SkFontStyle()));
+      typeface = SkTypeface::MakeFromName(base_font.GetFontName().c_str(),
+                                          SkFontStyle());
       DCHECK(typeface);
     }
 
-    text_paint->setTypeface(typeface.get());
-    // |text_paint| adds its own ref. Release the ref from CreateFontName.
+    text_paint->setTypeface(std::move(typeface));
   }
   return text_paint;
 }
 
 gfx::ImageSkiaRep ScaleImageSkiaRep(const gfx::ImageSkiaRep& rep,
                                     int target_width_dp,
                                     float target_scale) {
   int width_px = target_width_dp * target_scale;
   return gfx::ImageSkiaRep(
       skia::ImageOperations::Resize(rep.sk_bitmap(),
@@ skipping 205 matching lines @@
 }
 
 void IconWithBadgeImageSource::PaintBlockedActionDecoration(
     gfx::Canvas* canvas) {
   canvas->Save();
   gfx::ImageSkia img = *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       IDR_BLOCKED_EXTENSION_SCRIPT);
   canvas->DrawImageInt(img, size().width() - img.width(), 0);
   canvas->Restore();
 }