Make nanobench and dm be usable from Chromium build

Move the app logic for each app as follows:

<app>.cpp -- the file which contains main(). Embedders that compile
their own apps, such as ios shell, upcoming Chromium dm etc, do not use this.

<app>_main.cpp -- the main logic of the Skia test application. This will be
used by Skia -compiled apps as well as embedder -compiled apps.

<app>_main.h -- the API for the main logic. This will be
used by Skia -compiled apps as well as embedder -compiled apps.

This way (the upcoming) Chromium dm can setup its Chromium-specific setup
in custom main(), and then call dm_main(), without the need of any
SK_BUILD_FOR_XXXX defines controlling whether the tool defines main or not.

BUG=skia:2992

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

1 files changed, 2 insertions, 3 deletions

diff --git a/tools/iOSShell.cpp b/tools/iOSShell.cpp
index 8656e645aa..99d5ebd29a 100644
--- a/tools/iOSShell.cpp
+++ b/tools/iOSShell.cpp
@@ -13,6 +13,8 @@
 #include "SkCommonFlags.h"
 #include "SkGraphics.h"
 #include "SkWindow.h"
+#include "dm.h"
+#include "nanobench.h"
 #include "sk_tool_utils.h"
 
 //////////////////////////////////////////////////////////////////////////////
@@ -56,9 +58,6 @@ void ShellWindow::onSizeChange() {
 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);