NaCl Debugger: Implement overview and filters, cleanup

nacl/src/nacl_interface.cpp

Index: nacl/src/nacl_interface.cpp
===================================================================
--- nacl/src/nacl_interface.cpp	(revision 8014)
+++ nacl/src/nacl_interface.cpp	(working copy)
@@ -1,6 +1,11 @@
-#include <cstdio>
-#include <string>
 
+/*
+ * 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 "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
@@ -25,7 +30,7 @@
 void SkStringToProgramArgs(const SkString commandLine, int* argc, char*** argv) {
     int numBreaks = 0;
     const char* commandChars = commandLine.c_str();
-    for (int i = 0; i < strlen(commandChars); i++) {
+    for (size_t i = 0; i < strlen(commandChars); i++) {
         if (isspace(commandChars[i])) {
             numBreaks++;
         }
@@ -42,7 +47,7 @@
     char* start = (char*) commandChars;
     int length = 0;
     int argIndex = 0;
-    for (int i = 0; i < strlen(commandChars) + 1; i++) {
+    for (size_t i = 0; i < strlen(commandChars) + 1; i++) {
         if (isspace(commandChars[i]) || '\0' == commandChars[i]) {
             if (length > 0) {
                 char* argument = new char[length + 1];