Remove all uses of skia::RefPtr and stale includes

cc/layers/heads_up_display_layer_impl.h

 // Copyright 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.
 
 #ifndef CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 #define CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
 #include "cc/debug/debug_rect_history.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/memory_history.h"
 #include "cc/resources/scoped_resource.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 
 class SkCanvas;
 class SkPaint;
 class SkTypeface;
 struct SkRect;
 
 namespace cc {
 
 class FrameRateCounter;
 class PaintTimeCounter;
@@ skipping 15 matching lines @@
                    AppendQuadsData* append_quads_data) override;
   void UpdateHudTexture(DrawMode draw_mode,
                         ResourceProvider* resource_provider);
 
   void ReleaseResources() override;
 
   gfx::Rect GetEnclosingRectInTargetSpace() const override;
 
   bool IsAnimatingHUDContents() const { return fade_step_ > 0; }
 
-  void SetHUDTypeface(const skia::RefPtr<SkTypeface>& typeface);
+  void SetHUDTypeface(sk_sp<SkTypeface> typeface);
 
   // LayerImpl overrides.
   void PushPropertiesTo(LayerImpl* layer) override;
 
  private:
   class Graph {
    public:
     Graph(double indicator_value, double start_upper_bound);
 
     // Eases the upper bound, which limits what is currently visible in the
@@ skipping 61 matching lines @@
                      float stroke_width,
                      const std::string& label_text) const;
   void DrawDebugRects(SkCanvas* canvas, DebugRectHistory* debug_rect_history);
 
   void AcquireResource(ResourceProvider* resource_provider);
   void ReleaseUnmatchedSizeResources(ResourceProvider* resource_provider);
 
   std::vector<std::unique_ptr<ScopedResource>> resources_;
   sk_sp<SkSurface> hud_surface_;
 
-  skia::RefPtr<SkTypeface> typeface_;
+  sk_sp<SkTypeface> typeface_;
 
   float internal_contents_scale_;
   gfx::Size internal_content_bounds_;
 
   Graph fps_graph_;
   Graph paint_time_graph_;
   MemoryHistory::Entry memory_entry_;
   int fade_step_;
   std::vector<DebugRect> paint_rects_;
 
   base::TimeTicks time_of_last_graph_update_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_HEADS_UP_DISPLAY_LAYER_IMPL_H_