More Windows build fixes, some tidying in mojo_main

mojo/shell/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 import("//mojo/public/mojo.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
@@ skipping 101 matching lines @@
     "//mojo/application",
     "//mojo/application_manager",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/public/interfaces/application",
     "//mojo/services/public/interfaces/network",
     "//mojo/shell/domain_socket",
     "//mojo/spy",
   ]
 
+  if (is_win) {
+    deps -= [
+      "//mojo/shell/domain_socket",
+    ]
+  }
+
   if (is_android) {
     sources += [
       "network_application_loader.cc",
       "network_application_loader.h",
     ]
 
     deps += [
       "//mojo/services/native_viewport:lib",
       "//mojo/services/network:lib",
     ]
@@ skipping 78 matching lines @@
   deps = [ "//mojo/public/interfaces/application" ]
 }
 
 source_set("external_application_registrar_connection") {
   sources = [
     "external_application_registrar_connection.cc",
     "external_application_registrar_connection.h",
   ]
 
   deps = [
-   ":external_application_registrar_bindings",
-   "//mojo/shell/domain_socket"
+    ":external_application_registrar_bindings",
+    "//mojo/shell/domain_socket"
   ]
 }
 
 # GYP version: mojo/mojo.gyp:mojo_shell_tests
 test("mojo_shell_tests") {
   sources = [
     "child_process_host_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "dynamic_application_loader_unittest.cc",
     "in_process_dynamic_service_runner_unittest.cc",
@@ skipping 60 matching lines @@
     "//base/test:test_support",
     "//testing/gtest",
     "//url",
     "//mojo/application_manager",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/shell/domain_socket:tests",
   ]
 }