Remove all uses of skia::RefPtr and stale includes

cc/layers/heads_up_display_layer.h

Index: cc/layers/heads_up_display_layer.h
diff --git a/cc/layers/heads_up_display_layer.h b/cc/layers/heads_up_display_layer.h
index 60d8f53d750544eb5f1a500a20b4de5dafe76bee..da8f05a0bc5db729a779d01ce5494a79465b4e41 100644
--- a/cc/layers/heads_up_display_layer.h
+++ b/cc/layers/heads_up_display_layer.h
@@ -11,6 +11,7 @@
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 
 namespace cc {
@@ -40,7 +41,7 @@ class CC_EXPORT HeadsUpDisplayLayer : public Layer {
  private:
   ~HeadsUpDisplayLayer() override;
 
-  skia::RefPtr<SkTypeface> typeface_;
+  sk_sp<SkTypeface> typeface_;
 
   DISALLOW_COPY_AND_ASSIGN(HeadsUpDisplayLayer);
 };