remove SkInstCnt

It's been outclassed by Valgrind and leak sanitizer,
and it seems to be causing problems for external folks building Skia.

I'm not sure why our own builds seem unaffected.

Latest thread:
https://groups.google.com/forum/#!topic/skia-discuss/oj9FsQwwSF0

BUG=skia:

Review URL: https://codereview.chromium.org/1217573002

4 files changed, 5 insertions, 15 deletions

diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp
index f919812d13..b29f4d106e 100644
--- a/tools/bench_pictures_main.cpp
+++ b/tools/bench_pictures_main.cpp
@@ -204,8 +204,8 @@ static bool run_single_benchmark(const SkString& inputPath,
 
     SkString filename = SkOSPath::Basename(inputPath.c_str());
 
-    gWriter.bench(filename.c_str(), 
-                  SkScalarCeilToInt(picture->cullRect().width()), 
+    gWriter.bench(filename.c_str(),
+                  SkScalarCeilToInt(picture->cullRect().width()),
                   SkScalarCeilToInt(picture->cullRect().height()));
 
     benchmark.run(picture, FLAGS_mpd);
@@ -444,9 +444,6 @@ int tool_main(int argc, char** argv) {
     gWriter.add(&gLogWriter);
 
 
-#if SK_ENABLE_INST_COUNT
-    gPrintInstCount = true;
-#endif
     SkAutoGraphics ag;
 
     sk_tools::PictureBenchmark benchmark;
diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp
index 6883ff2047..c1edb48adf 100644
--- a/tools/filtermain.cpp
+++ b/tools/filtermain.cpp
@@ -638,7 +638,7 @@ static int filter_picture(const SkString& inFile, const SkString& outFile) {
 
     memset(localCount, 0, sizeof(localCount));
 
-    SkDebugCanvas debugCanvas(SkScalarCeilToInt(inPicture->cullRect().width()), 
+    SkDebugCanvas debugCanvas(SkScalarCeilToInt(inPicture->cullRect().width()),
                               SkScalarCeilToInt(inPicture->cullRect().height()));
     inPicture->playback(&debugCanvas);
 
@@ -678,8 +678,8 @@ static int filter_picture(const SkString& inFile, const SkString& outFile) {
 
     if (!outFile.isEmpty()) {
         SkPictureRecorder recorder;
-        SkCanvas* canvas = recorder.beginRecording(inPicture->cullRect().width(), 
-                                                   inPicture->cullRect().height(), 
+        SkCanvas* canvas = recorder.beginRecording(inPicture->cullRect().width(),
+                                                   inPicture->cullRect().height(),
                                                    NULL, 0);
         debugCanvas.draw(canvas);
         SkAutoTUnref<SkPicture> outPicture(recorder.endRecording());
@@ -712,10 +712,6 @@ static int filter_picture(const SkString& inFile, const SkString& outFile) {
 int tool_main(int argc, char** argv); // suppress a warning on mac
 
 int tool_main(int argc, char** argv) {
-#if SK_ENABLE_INST_COUNT
-    gPrintInstCount = true;
-#endif
-
     SkGraphics::Init();
 
     if (argc < 3) {
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 1a9018bec1..09e74ba790 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -26,8 +26,6 @@ DEFINE_string(gpuAPI, "", "Force use of specific gpu API.  Using \"gl\" "
 
 DEFINE_string(images, "resources", "Directory of images to decode.");
 
-DEFINE_bool2(leaks, l, false, "show leaked ref cnt'd objects.");
-
 DEFINE_string2(match, m, NULL,
                "[~][^]substring[$] [...] of GM name to run.\n"
                "Multiple matches may be separated by spaces.\n"
diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h
index 6a5ff58f4f..d6fb2c1d9b 100644
--- a/tools/flags/SkCommonFlags.h
+++ b/tools/flags/SkCommonFlags.h
@@ -16,7 +16,6 @@ DECLARE_bool(dryRun);
 DECLARE_bool(gpu);
 DECLARE_string(gpuAPI);
 DECLARE_string(images);
-DECLARE_bool(leaks);
 DECLARE_string(match);
 DECLARE_bool(quiet);
 DECLARE_bool(resetGpuContext);