Revert of Make nanobench and dm be usable from Chromium build

tools/iOSShell.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "iOSShell.h"
 
 #include "Resources.h"
 #include "SkApplication.h"
 #include "SkCanvas.h"
 #include "SkCommonFlags.h"
 #include "SkGraphics.h"
 #include "SkWindow.h"
-#include "dm.h"
-#include "nanobench.h"
 #include "sk_tool_utils.h"
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* curr_view(SkWindow* wind) {
     SkView::F2BIter iter(wind);
     return iter.next();
 }
 
 ShellWindow::ShellWindow(void* hwnd, int argc, char** argv)
@@ skipping 23 matching lines @@
     this->INHERITED::onSizeChange();
 
     SkView::F2BIter iter(this);
     SkView* view = iter.next();
     view->setSize(this->width(), this->height());
 }
 
 DEFINE_bool(dm, false, "run dm");
 DEFINE_bool(nanobench, false, "run nanobench");
 
+int nanobench_main();
+int dm_main();
+
 IOS_launch_type set_cmd_line_args(int argc, char *argv[], const char* resourceDir) {
     SkCommandLineFlags::Parse(argc, argv);
     SetResourcePath(resourceDir);
     if (FLAGS_nanobench) {
         return nanobench_main() ? kError_iOSLaunchType : kTool_iOSLaunchType;
     }
     if (FLAGS_dm) {
         return dm_main() ? kError_iOSLaunchType : kTool_iOSLaunchType;
     }
     return kError_iOSLaunchType;
@@ skipping 20 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }