Move SkNoncopyable to include/private.

Change-Id: I62f60ea52faeebddecacf03d9429ac3f7c516b8e
Reviewed-on: https://skia-review.googlesource.com/141823
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/modules/skottie/include/Skottie.h b/modules/skottie/include/Skottie.h
index 54f293c849..428a3a6de0 100644
--- a/modules/skottie/include/Skottie.h
+++ b/modules/skottie/include/Skottie.h
@@ -24,9 +24,12 @@ namespace sksg { class Scene;  }
 
 namespace skottie {
 
-class SK_API ResourceProvider : public SkNoncopyable {
+class SK_API ResourceProvider {
 public:
+    ResourceProvider() = default;
     virtual ~ResourceProvider() = default;
+    ResourceProvider(const ResourceProvider&) = delete;
+    ResourceProvider& operator=(const ResourceProvider&) = delete;
 
     virtual std::unique_ptr<SkStream> openStream(const char resource[]) const = 0;
 };
diff --git a/modules/skottie/src/SkottieTool.cpp b/modules/skottie/src/SkottieTool.cpp
index 5e819b17e9..b62102ab42 100644
--- a/modules/skottie/src/SkottieTool.cpp
+++ b/modules/skottie/src/SkottieTool.cpp
@@ -32,9 +32,11 @@ DEFINE_int32(height, 600, "Render height.");
 
 namespace {
 
-class Sink : public SkNoncopyable {
+class Sink {
 public:
     virtual ~Sink() = default;
+    Sink(const Sink&) = delete;
+    Sink& operator=(const Sink&) = delete;
 
     bool handleFrame(const sk_sp<skottie::Animation>& anim, size_t idx) const {
         const auto frame_file = SkStringPrintf("0%06d.%s", idx, fExtension.c_str());
@@ -56,8 +58,6 @@ protected:
 
 private:
     const SkString fExtension;
-
-    using INHERITED = SkNoncopyable;
 };
 
 class PNGSink final : public Sink {