Style Change: SkNEW->new; SkDELETE->delete

tests/SkpSkGrTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
@@ skipping 146 matching lines @@
         SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024);
         (*fTestFun)(&fState);
     }
 
     SkpSkGrThreadState fState;
     void (*fTestFun)(SkpSkGrThreadState*);
 };
 
 SkpSkGrThreadedTestRunner::~SkpSkGrThreadedTestRunner() {
     for (int index = 0; index < fRunnables.count(); index++) {
-        SkDELETE(fRunnables[index]);
+        delete fRunnables[index];
     }
 }
 
 void SkpSkGrThreadedTestRunner::render() {
     // TODO: we don't really need to be using SkRunnables here anymore.
     // We can just write the code we'd run right in the for loop.
     sk_parallel_for(fRunnables.count(), [&](int i) {
         fRunnables[i]->run();
     });
 }
@@ skipping 292 matching lines @@
             int grTime = timePict(pic, &grCanvas);
             fTime = skTime - grTime;
         } else if (fTestStep == kEncodeFiles) {
             SkString pngStr = make_png_name(fFilename);
             const char* pngName = pngStr.c_str();
             writePict(grBitmap, outGrDir, pngName);
             writePict(bitmap, outSkDir, pngName);
         }
     }
 finish:
-    SkDELETE(pic);
+    delete pic;
 }
 
 static SkString makeStatusString(int dirNo) {
     SkString statName;
     statName.printf("stats%d.txt", dirNo);
     SkString statusFile = make_filepath(0, outStatusDir, statName.c_str());
     return statusFile;
 }
 
 class PreParser {
@@ skipping 207 matching lines @@
                 bumpCount(reporter, true);
                 continue;
             }
             for (size_t index = 0; index < skipOverSkGrCount; ++index) {
                 if (skipOverSkGr[index].directory == dirIndex
                         && strcmp(filename.c_str(), skipOverSkGr[index].filename) == 0) {
                     bumpCount(reporter, true);
                     goto skipOver;
                 }
             }
-            *testRunner.fRunnables.append() = SkNEW_ARGS(SkpSkGrThreadedRunnable,
-                    (&testSkGrMain, dirIndex, filename.c_str(), &testRunner));
+            *testRunner.fRunnables.append() = new SkpSkGrThreadedRunnable(
+                    &testSkGrMain, dirIndex, filename.c_str(), &testRunner);
     skipOver:
             ;
         }
     }
     testRunner.render();
     SkpSkGrThreadState& max = testRunner.fRunnables[0]->fState;
     for (int dirIndex = 2; dirIndex <= 100; ++dirIndex) {
         SkpSkGrThreadState& state = testRunner.fRunnables[dirIndex - 1]->fState;
         for (int index = 0; index < state.fFoundCount; ++index) {
             int maxIdx = max.fFoundCount;
@@ skipping 31 matching lines @@
     int testIndex = 166;
     int dirIndex = skipOverSkGr[testIndex - 166].directory;
     SkString pictDir = make_in_dir_name(dirIndex);
     if (pictDir.size() == 0) {
         return;
     }
     SkString filename(skipOverSkGr[testIndex - 166].filename);
     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose());
     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose());
 }