Build sync by default on all platforms. Add a command line parameter to enab...

chrome/chrome.gyp

Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp	(revision 29809)
+++ chrome/chrome.gyp	(working copy)
@@ -124,6 +124,7 @@
       '../views/controls/table/table_view_unittest.cc',
       '../views/grid_layout_unittest.cc',
     ],
+    'browser_sync%': 1,
     'conditions': [
       ['OS=="win"', {
         'nacl_defines': [
@@ -156,12 +157,6 @@
           }],  # branding
         ],  # conditions
       }],  # OS=="mac"
-      ['OS=="win" or OS=="mac"', {
-        # Whether or not browser sync code is built in.
-        'browser_sync%': 1,
-      }, {
-        'browser_sync%': 0,
-      }],  # OS=="win"
       ['target_arch=="ia32"', {
         'nacl_defines': [
           # TODO(gregoryd): consider getting this from NaCl's common.gypi
@@ -2440,6 +2435,8 @@
             '../base/base.gyp:linux_versioninfo',
           ],
           'sources!': [
+            'browser/sync/sync_setup_flow.cc',
+            'browser/sync/sync_setup_wizard.cc',
             'browser/views/extensions/extension_shelf.cc',
             'browser/views/extensions/extension_shelf.h',
             'browser/views/extensions/extension_view.cc',
@@ -2975,6 +2972,12 @@
             '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
         }],
+        ['OS=="linux" and browser_sync==1', {
+          'sources': [
+            'browser/gtk/sync_setup_wizard_gtk.cc',
+            'browser/gtk/sync_setup_wizard_gtk.h',
+          ],
+        }],
       ],
     },
     {
@@ -4660,6 +4663,7 @@
             'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
           ],
           'sources!': [
+            'browser/sync/sync_setup_wizard_unittest.cc',
             'browser/views/bookmark_context_menu_test.cc',
             'browser/gtk/options/cookies_view_unittest.cc',
             # Compact Language Detection (cld) is not supported in linux yet.
@@ -4796,7 +4800,6 @@
             'browser/rlz/rlz_unittest.cc',
             'browser/safe_browsing/safe_browsing_blocking_page_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
-            'browser/sync/profile_sync_service_unittest.cc',
             'browser/views/bookmark_editor_view_unittest.cc',
             'browser/views/find_bar_host_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',
@@ -6669,6 +6672,9 @@
                 'POSIX',
                 'OS_LINUX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
           ],
         },
@@ -6689,7 +6695,6 @@
             'browser/sync/syncable/syncable_unittest.cc',
             'browser/sync/util/character_set_converters_unittest.cc',
             'browser/sync/util/crypto_helpers_unittest.cc',
-            'browser/sync/util/data_encryption_unittest.cc',
             'browser/sync/util/event_sys_unittest.cc',
             'browser/sync/util/highres_timer_unittest.cc',
             'browser/sync/util/path_helpers_unittest.cc',
@@ -6723,6 +6728,9 @@
           ],
           'conditions': [
             ['OS=="win"', {
+              'sources' : [
+                'browser/sync/util/data_encryption_unittest.cc',
+              ],
               'dependencies': [
                 '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
               ],
@@ -6742,6 +6750,9 @@
               'defines': [
                 'POSIX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
           ],
         },
@@ -6897,6 +6908,9 @@
               'defines': [
                 'POSIX',
               ],
+              'dependencies': [
+                '../build/linux/system.gyp:gtk'
+              ],
             }],
             ['OS=="mac"', {
               'link_settings': {