More Windows build fixes, some tidying in mojo_main

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index e67db15e882aaa2360aa53e3672868c920f81cf0..7699e2d4a5127e87ea8eaebd81d0fec38a2bf3bf 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -119,6 +119,16 @@ source_set("lib") {
     "//mojo/spy",
   ]
 
+  if (!is_win) {
+    deps -= [

[jamesr, 2014/11/04 18:56:06]

+= ?

[scottmg, 2014/11/04 18:57:19]

Thanks, sorry about that.

+      "//mojo/shell/domain_socket",
+    ]
+    sources -= [
+      "external_application_listener_posix.cc",
+      "incoming_connection_listener_posix.cc",
+    ]
+  }
+
   if (is_android) {
     sources += [
       "network_application_loader.cc",
@@ -217,8 +227,8 @@ source_set("external_application_registrar_connection") {
   ]
 
   deps = [
-   ":external_application_registrar_bindings",
-   "//mojo/shell/domain_socket"
+    ":external_application_registrar_bindings",
+    "//mojo/shell/domain_socket"
   ]
 }