Added sync_socket.h include in sync_socket_win.cc

runtime/bin/socket_base_win.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #if !defined(DART_IO_DISABLED)
 
 #include "platform/globals.h"
 #if defined(HOST_OS_WINDOWS)
 
 #include "bin/socket_base.h"
@@ skipping 156 matching lines @@
 
 
 intptr_t SocketBase::GetStdioHandle(intptr_t num) {
   if (num != 0) {
     return -1;
   }
   HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
   if (handle == INVALID_HANDLE_VALUE) {
     return -1;
   }
-<<<<<<< HEAD
   StdHandle* std_handle = StdHandle::Stdin(handle);
   std_handle->Retain();
-=======
-  StdHandle* std_handle = new StdHandle(handle);
->>>>>>> Revert "Reverting until bots clear up."
   std_handle->MarkDoesNotSupportOverlappedIO();
   std_handle->EnsureInitialized(EventHandler::delegate());
   return reinterpret_cast<intptr_t>(std_handle);
 }
 
 
-<<<<<<< HEAD
-=======
-intptr_t ServerSocket::Accept(intptr_t fd) {
-  ListenSocket* listen_socket = reinterpret_cast<ListenSocket*>(fd);
-  ClientSocket* client_socket = listen_socket->Accept();
-  if (client_socket != NULL) {
-    return reinterpret_cast<intptr_t>(client_socket);
-  } else {
-    return -1;
-  }
-}
-
-
->>>>>>> Revert "Reverting until bots clear up."
 AddressList<SocketAddress>* SocketBase::LookupAddress(const char* host,
                                                       int type,
                                                       OSError** os_error) {
   Initialize();
 
   // Perform a name lookup for a host name.
   struct addrinfo hints;
   memset(&hints, 0, sizeof(hints));
   hints.ai_family = SocketAddress::FromType(type);
   hints.ai_socktype = SOCK_STREAM;
@@ skipping 251 matching lines @@
   return setsockopt(handle->socket(), proto, MCAST_LEAVE_GROUP,
                     reinterpret_cast<char*>(&mreq), sizeof(mreq)) == 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(HOST_OS_WINDOWS)
 
 #endif  // !defined(DART_IO_DISABLED)