Change the name of SkFlags to SkCommandLineFlags.

tools/bench_pictures_main.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "BenchTimer.h"
 #include "CopyTilesRenderer.h"
 #include "PictureBenchmark.h"
 #include "PictureRenderingFlags.h"
 #include "SkBenchLogger.h"
-#include "SkFlags.h"
+#include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #if LAZY_CACHE_STATS
     #include "SkLazyPixelRef.h"
 #endif
 #include "SkLruImageCache.h"
 #include "SkMath.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkStream.h"
@@ skipping 359 matching lines @@
     }
     return failures;
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkString usage;
     usage.printf("Time drawing .skp files.\n"
                  "\tPossible arguments for --filter: [%s]\n\t\t[%s]",
                  filterTypesUsage().c_str(), filterFlagsUsage().c_str());
-    SkFlags::SetUsage(usage.c_str());
-    SkFlags::ParseCommandLine(argc, argv);
+    SkCommandLineFlags::SetUsage(usage.c_str());
+    SkCommandLineFlags::Parse(argc, argv);
 
     if (FLAGS_repeat < 1) {
         SkString error;
         error.printf("--repeats must be >= 1. Was %i\n", FLAGS_repeat);
         gLogger.logError(error);
         exit(-1);
     }
 
     if (FLAGS_logFile.count() == 1) {
         if (!gLogger.SetLogFile(FLAGS_logFile[0])) {
@@ skipping 35 matching lines @@
     }
 #endif
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif