2 files changed, 6 insertions, 6 deletions
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp
index 9ab6563040..2f98693da2 100644
--- a/gm/colormatrix.cpp
+++ b/gm/colormatrix.cpp
@@ -12,9 +12,9 @@
 #define WIDTH 500
 #define HEIGHT 500
 
-class SkOnce {
+class SkDoOnce {
 public:
-    SkOnce() : fOnce(false) {};
+    SkDoOnce() : fOnce(false) {};
 
     bool once() const {
         if (fOnce) {
@@ -39,7 +39,7 @@ static void setArray(SkPaint* paint, const SkScalar array[]) {
 namespace skiagm {
 
 class ColorMatrixGM : public GM {
-    SkOnce fOnce;
+    SkDoOnce fOnce;
     void init() {
         if (fOnce.once()) {
             fSolidBitmap = this->createSolidBitmap(64, 64);
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index 8eb4cba49d..91afbfeba3 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -9,9 +9,9 @@
 #include "SkRandom.h"
 #include "SkTArray.h"
 
-class SkOnce : SkNoncopyable {
+class SkDoOnce : SkNoncopyable {
 public:
-    SkOnce() { fDidOnce = false; }
+    SkDoOnce() { fDidOnce = false; }
 
     bool needToDo() const { return !fDidOnce; }
     bool alreadyDone() const { return fDidOnce; }
@@ -27,7 +27,7 @@ private:
 namespace skiagm {
 
 class ConvexPathsGM : public GM {
-    SkOnce fOnce;
+    SkDoOnce fOnce;
 public:
     ConvexPathsGM() {
         this->setBGColor(0xFF000000);