Build sync engine as part of the browser build

chrome/browser/sync/engine/syncapi.cc

Index: chrome/browser/sync/engine/syncapi.cc
===================================================================
--- chrome/browser/sync/engine/syncapi.cc	(revision 26149)
+++ chrome/browser/sync/engine/syncapi.cc	(working copy)
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/sync/engine/syncapi.h"
 
-#if defined(OS_WINDOWS)
+#include "build/build_config.h"
+
+#if defined(OS_WIN)
 #include <windows.h>
 #include <iphlpapi.h>
 #endif
@@ -77,7 +79,7 @@
 
 struct ThreadParams {
   browser_sync::ServerConnectionManager* conn_mgr;
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
   HANDLE exit_flag;
 #endif
 };
@@ -89,7 +91,7 @@
   NameCurrentThreadForDebugging("SyncEngine_AddressWatcher");
   LOG(INFO) << "starting the address watch thread";
   const ThreadParams* const params = reinterpret_cast<const ThreadParams*>(arg);
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
   OVERLAPPED overlapped = {0};
   overlapped.hEvent = CreateEvent(NULL, FALSE, TRUE, NULL);
   HANDLE file;
@@ -168,7 +170,7 @@
 static inline void String16ToPathString(const sync_char16 *in,
                                         PathString *out) {
   string16 in_str(in);
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
   out->assign(in_str);
 #else
   UTF16ToUTF8(in_str.c_str(), in_str.length(), out);
@@ -176,7 +178,7 @@
 }
 
 static inline void PathStringToString16(const PathString& in, string16* out) {
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
   out->assign(in);
 #else
   UTF8ToUTF16(in.c_str(), in.length(), out);
@@ -1013,7 +1015,7 @@
   // platform independent in here.
   // TODO(ncarter): When this gets cleaned up, the implementation of
   // CreatePThread can also be removed.
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
   HANDLE exit_flag = CreateEvent(NULL, TRUE /*manual reset*/, FALSE, NULL);
   address_watch_params_.exit_flag = exit_flag;
 #endif
@@ -1207,7 +1209,7 @@
   syncer_event_.reset();
   authwatcher_hookup_.reset();
 
-#if defined(OS_WINDOWS)
+#if defined(OS_WIN)
   // Stop the address watch thread by signaling the exit flag.
   // TODO(timsteele): Same as todo in Init().
   SetEvent(address_watch_params_.exit_flag);