Remove GrRenderTargetContextPriv and GrSurfaceContextPriv

I think this is vestigial from some time in the past where RTC was
public.

Also just expose the methods that add ops rather than have so many
friends + testingOnly versions.

Change-Id: I60d9fdff23b2d67039a7b37815da7ff9e73d8999
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339158
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
diff --git a/tests/BulkRectTest.cpp b/tests/BulkRectTest.cpp
index 4c974d2..c0a4d99 100644
--- a/tests/BulkRectTest.cpp
+++ b/tests/BulkRectTest.cpp
@@ -10,7 +10,6 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRenderTargetContext.h"
-#include "src/gpu/GrRenderTargetContextPriv.h"
 #include "src/gpu/ops/GrFillRectOp.h"
 #include "src/gpu/ops/GrTextureOp.h"
 #include "tests/Test.h"
@@ -157,7 +156,7 @@
                                                overallAA,
                                                &quad,
                                                nullptr);
-            rtc->priv().testingOnly_addDrawOp(nullptr, std::move(op));
+            rtc->addDrawOp(nullptr, std::move(op));
         }
     } else {
         GrTextureOp::AddTextureSetOps(rtc.get(),