Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed.

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' : {
     'pyautolib_sources': [
       'app/chrome_dll_resource.h',
       'common/pref_names.cc',
       'common/pref_names.h',
@@ skipping 98 matching lines @@
         'test/automation/window_proxy.cc',
         'test/automation/window_proxy.h',
         'test/chrome_process_util.cc',
         'test/chrome_process_util.h',
         'test/chrome_process_util_mac.cc',
         'test/model_test_utils.cc',
         'test/model_test_utils.h',
         'test/profile_mock.h',
         'test/test_browser_window.h',
         'test/test_location_bar.h',
+        'test/testing_pref_service.cc',
+        'test/testing_pref_service.h',
         'test/testing_profile.cc',
         'test/testing_profile.h',
         'test/thread_observer_helper.h',
         'test/ui_test_utils.cc',
         'test/ui_test_utils.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.cc',
         'test/ui_test_utils_win.cc',
       ],
       'conditions': [
@@ skipping 849 matching lines @@
         'browser/importer/firefox_importer_unittest_utils.h',
         'browser/importer/firefox_importer_unittest_utils_mac.cc',
         'browser/importer/firefox_profile_lock_unittest.cc',
         'browser/importer/firefox_proxy_settings_unittest.cc',
         'browser/importer/importer_unittest.cc',
         'browser/importer/safari_importer_unittest.mm',
         'browser/importer/toolbar_importer_unittest.cc',
         'browser/in_process_webkit/dom_storage_dispatcher_host_unittest.cc',
         'browser/in_process_webkit/webkit_context_unittest.cc',
         'browser/in_process_webkit/webkit_thread_unittest.cc',
-        'browser/pref_value_store_unittest.cc',
         'browser/keychain_mock_mac.cc',
         'browser/keychain_mock_mac.h',
         'browser/login_prompt_unittest.cc',
         'browser/mach_broker_mac_unittest.cc',
         'browser/managed_prefs_banner_base_unittest.cc',
         'browser/metrics/metrics_log_unittest.cc',
         'browser/metrics/metrics_response_unittest.cc',
         'browser/metrics/metrics_service_unittest.cc',
         'browser/mock_configuration_policy_provider.h',
         'browser/mock_configuration_policy_store.h',
@@ skipping 15 matching lines @@
         'browser/password_manager/encryptor_password_mac_unittest.cc',
         'browser/password_manager/login_database_unittest.cc',
         'browser/password_manager/password_form_data.cc',
         'browser/password_manager/password_form_manager_unittest.cc',
         'browser/password_manager/password_manager_unittest.cc',
         'browser/password_manager/password_store_default_unittest.cc',
         'browser/password_manager/password_store_mac_unittest.cc',
         'browser/password_manager/password_store_win_unittest.cc',
         'browser/pref_member_unittest.cc',
         'browser/pref_service_unittest.cc',
+        'browser/pref_set_observer_unittest.cc',
+        'browser/pref_value_store_unittest.cc',
         'browser/preferences_mock_mac.cc',
         'browser/preferences_mock_mac.h',
         'browser/printing/print_dialog_cloud_unittest.cc',
         'browser/printing/print_job_unittest.cc',
         'browser/process_info_snapshot_mac_unittest.cc',
         'browser/profile_manager_unittest.cc',
         'browser/renderer_host/audio_renderer_host_unittest.cc',
         'browser/renderer_host/gtk_im_context_wrapper_unittest.cc',
         'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
         'browser/renderer_host/render_widget_host_unittest.cc',
@@ skipping 1694 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: