Rename CHROME_PERSONALIZATION to BROWSER_SYNC.

Avoid #ifdef in general, favoring #if defined().

In one spot, use PlatformThread::Sleep instead of rolling our own.

Review URL: http://codereview.chromium.org/267125

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29360 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 9 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6f541b19..f58b854 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -158,9 +158,9 @@
       }],  # OS=="mac"
       ['OS=="win" or OS=="mac"', {
         # Whether or not browser sync code is built in.
-        'chrome_personalization%': 1,
+        'browser_sync%': 1,
       }, {
-        'chrome_personalization%': 0,
+        'browser_sync%': 0,
       }],  # OS=="win"
       ['target_arch=="ia32"', {
         'nacl_defines': [
@@ -206,9 +206,11 @@
       ['OS=="linux" and toolkit_views==1', {'sources/': [
         ['include', '_views\\.cc$'],
       ]}],
-      ['(OS=="win" or OS=="mac") and chrome_personalization==1', {
-         'defines': ['CHROME_PERSONALIZATION=1'],
-      }],  # chrome_personalization==1
+      ['browser_sync==0', {'sources/': [
+        ['exclude', '^(browser/sync|browser/views/sync).*cc$'],
+      ]}, {'defines': [
+        'BROWSER_SYNC=1',
+      ]}],
     ],
   },
   'targets': [
@@ -4782,7 +4784,7 @@
             'common/net/url_util_unittest.cc',
           ],
         }],
-        ['chrome_personalization==1', {
+        ['browser_sync==1', {
           'sources!': [
             'browser/sync/profile_sync_service_unittest.cc',
           ]
@@ -4835,7 +4837,7 @@
       'target_name': 'syncapi',
 
       'conditions': [
-        ['chrome_personalization==0', {
+        ['browser_sync==0', {
           # Empty target.
           'type': 'none',
         }, {
@@ -6521,7 +6523,7 @@
         },
       ]
     }],
-    ['chrome_personalization==1', {
+    ['browser_sync==1', {
       # These targets get built only where sync is supported.
       'targets': [
         {
@@ -6891,7 +6893,7 @@
             }],
           ],
         },
-      ],  # targets when chrome_personalization==1
+      ],  # targets when browser_sync==1
     }],
   ],  # 'conditions'
 }