Build sync engine as part of the browser build

chrome/browser/sync/syncable/syncable.cc

Index: chrome/browser/sync/syncable/syncable.cc
===================================================================
--- chrome/browser/sync/syncable/syncable.cc	(revision 26149)
+++ chrome/browser/sync/syncable/syncable.cc	(working copy)
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/sync/syncable/syncable.h"
 
+#include "build/build_config.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
@@ -11,7 +13,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 #elif defined(OS_LINUX)
 #include <glib.h>
-#elif defined(OS_WINDOWS)
+#elif defined(OS_WIN)
 #include <shlwapi.h>  // for PathMatchSpec
 #endif
 
@@ -36,7 +38,7 @@
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
 #include "chrome/browser/sync/syncable/syncable_columns.h"
 #include "chrome/browser/sync/util/character_set_converters.h"
-#include "chrome/browser/sync/util/compat-file.h"
+#include "chrome/browser/sync/util/compat_file.h"
 #include "chrome/browser/sync/util/crypto_helpers.h"
 #include "chrome/browser/sync/util/event_sys-inl.h"
 #include "chrome/browser/sync/util/fast_dump.h"
@@ -67,7 +69,7 @@
 namespace syncable {
 
 int64 Now() {
-#ifdef OS_WINDOWS
+#ifdef OS_WIN
   FILETIME filetime;
   SYSTEMTIME systime;
   GetSystemTime(&systime);
@@ -91,7 +93,7 @@
 // Callback for sqlite3
 int ComparePathNames16(void*, int a_bytes, const void* a, int b_bytes,
                        const void* b) {
-#ifdef OS_WINDOWS
+#ifdef OS_WIN
   DCHECK_EQ(0, a_bytes % 2);
   DCHECK_EQ(0, b_bytes % 2);
   int result = CompareString(LOCALE_INVARIANT, NORM_IGNORECASE,
@@ -252,7 +254,7 @@
 }
 
 BOOL PathNameMatch(const PathString& pathname, const PathString& pathspec) {
-#ifdef OS_WINDOWS
+#ifdef OS_WIN
   // Note that if we go Vista only this is easier:
   // http://msdn2.microsoft.com/en-us/library/ms628611.aspx
 
@@ -1866,7 +1868,7 @@
 
 PathString GetFullPath(BaseTransaction* trans, const Entry& e) {
   PathString result;
-#ifdef STL_MSVC
+#ifdef COMPILER_MSVC
   result.reserve(MAX_PATH);
 #endif
   ReverseAppend(e.Get(NAME), &result);