More Windows build fixes, some tidying in mojo_main

mojo/shell/incoming_connection_listener_unittest.cc

Index: mojo/shell/incoming_connection_listener_unittest.cc
diff --git a/mojo/shell/incoming_connection_listener_unittest.cc b/mojo/shell/incoming_connection_listener_unittest.cc
index bae4c99fa0743602159b750614507515ea3d65de..3208fdd6dba26473f13eef7db5de920657187964 100644
--- a/mojo/shell/incoming_connection_listener_unittest.cc
+++ b/mojo/shell/incoming_connection_listener_unittest.cc
@@ -136,7 +136,9 @@ TEST_F(IncomingConnectionListenerTest, ConnectFails_SocketFileUndeletable) {
 }
 
 TEST_F(IncomingConnectionListenerTest, ConnectFails_SocketDirNonexistent) {
-  base::FilePath nonexistent_dir(temp_dir_.path().Append("dir").Append("file"));
+  base::FilePath nonexistent_dir(temp_dir_.path()
+                                     .Append(FILE_PATH_LITERAL("dir"))
+                                     .Append(FILE_PATH_LITERAL("file")));
 
   ListeningFailsDelegate fail_delegate(net::ERR_FILE_NOT_FOUND);
   IncomingConnectionListenerPosix listener(nonexistent_dir, &fail_delegate);