Take 2: sync changes to support encryption

chrome/chrome_tests.gypi

 # Copyright (c) 2010 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' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/browser_actions_container_browsertest.cc',
     ],
@@ skipping 1280 matching lines @@
         }],
       ],
     },
     {
       # Executable that runs each browser test in a new process.
       'target_name': 'browser_tests',
       'type': 'executable',
       'msvs_guid': 'D7589D0D-304E-4589-85A4-153B7D84B07F',
       'dependencies': [
         'browser',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'chrome',
         'chrome_resources',
         'chrome_strings',
         'debugger',
         'profile_import',
         'renderer',
         'test_support_common',
         '../app/app.gyp:app_base',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ skipping 738 matching lines @@
           'dependencies': [
             'plugin',
            ],
           'export_dependent_settings': [
             'plugin',
           ],
         }],
         ['OS=="linux"', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
+             '../build/linux/system.gyp:nss',
            ],
         }],
         ['OS=="win"', {
           'sources': [
             'app/chrome_dll.rc',
             'app/chrome_dll_version.rc.version',
             'test/data/resource.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
@@ skipping 481 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: