Change the name of SkFlags to SkCommandLineFlags.

tools/skhello.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
-#include "SkFlags.h"
+#include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkImageEncoder.h"
 #include "SkString.h"
 
 DEFINE_string(o, "skhello.png", "The filename to write the image.");
 DEFINE_string(t, "Hello", "The string to write.");
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
-    SkFlags::SetUsage("");
-    SkFlags::ParseCommandLine(argc, argv);
+    SkCommandLineFlags::SetUsage("");
+    SkCommandLineFlags::Parse(argc, argv);
 
     SkAutoGraphics ag;
     SkString path("skhello.png");
     SkString text("Hello");
 
     if (!FLAGS_o.isEmpty()) {
         path.set(FLAGS_o[0]);
     }
     if (!FLAGS_t.isEmpty()) {
         text.set(FLAGS_t[0]);
@@ skipping 25 matching lines @@
         SkDebugf("--- failed to write %s\n", path.c_str());
     }
     return !success;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif