Reverting 23343.

chrome/chrome.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
-
-    # Whether or not browser sync code is built in.
-    'chrome_personalization%': 1,
-
-    # Used to build and statically link a stub (no-op) syncapi engine.
-    'use_syncapi_stub%' : 1,
-
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
     # Linux or Mac, and into chrome.dll on Windows.
     'chromium_dependencies': [
       'common',
       'browser',
       'debugger',
       'renderer',
       'utility',
@@ skipping 2190 matching lines @@
             'browser/views/tabs/tab_overview_types.h',
           ],
           'configurations': {
             'Debug': {
               'msvs_precompiled_header': 'tools/build/win/precompiled_wtl.h',
               'msvs_precompiled_source': 'tools/build/win/precompiled_wtl.cc',
             },
           },
           'conditions': [
             ['use_syncapi_stub==1', {
-              'defines': ['COMPILING_SYNCAPI_STUB'],
               'sources': [
                 'browser/sync/engine/syncapi_stub.cc',
               ],
-            }],  # use_syncapi_stub==1
-            ['chrome_personalization==1', {
-               'defines': ['CHROME_PERSONALIZATION=1'],
-            }],  # chrome_personalization==1
+            }]  # use_syncapi_stub==1
           ],
         }, {  # 'OS!="win"
           'sources/': [
             # Exclude all of hang_monitor.
             ['exclude', '^browser/hang_monitor/'],
 
             # Exclude parts of password_manager.
             ['exclude', '^browser/password_manager/ie7_password\\.cc$'],
 
             # Exclude most of printing.
@@ skipping 3248 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }