| Index: chrome/chrome_browser.gypi
|
| diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
|
| index 2b48e03e925f028c1a833906fff44479d021834f..e20deca027254a25a34332f377ad9ef1808a5883 100644
|
| --- a/chrome/chrome_browser.gypi
|
| +++ b/chrome/chrome_browser.gypi
|
| @@ -1628,31 +1628,6 @@
|
| 'browser/profiles/refcounted_profile_keyed_service_factory.cc',
|
| 'browser/profiles/refcounted_profile_keyed_service_factory.h',
|
| 'browser/profiles/storage_partition_descriptor.h',
|
| - 'browser/protector/base_prefs_change.cc',
|
| - 'browser/protector/base_prefs_change.h',
|
| - 'browser/protector/base_setting_change.cc',
|
| - 'browser/protector/base_setting_change.h',
|
| - 'browser/protector/composite_settings_change.cc',
|
| - 'browser/protector/composite_settings_change.h',
|
| - 'browser/protector/default_search_provider_change.cc',
|
| - 'browser/protector/histograms.cc',
|
| - 'browser/protector/histograms.h',
|
| - 'browser/protector/homepage_change.cc',
|
| - 'browser/protector/keys.cc',
|
| - 'browser/protector/keys.h',
|
| - 'browser/protector/prefs_backup_invalid_change.cc',
|
| - 'browser/protector/protected_prefs_watcher.cc',
|
| - 'browser/protector/protected_prefs_watcher.h',
|
| - 'browser/protector/protector_service.cc',
|
| - 'browser/protector/protector_service.h',
|
| - 'browser/protector/protector_service_factory.cc',
|
| - 'browser/protector/protector_service_factory.h',
|
| - 'browser/protector/protector_utils.cc',
|
| - 'browser/protector/protector_utils.h',
|
| - 'browser/protector/session_startup_change.cc',
|
| - 'browser/protector/settings_change_global_error.cc',
|
| - 'browser/protector/settings_change_global_error.h',
|
| - 'browser/protector/settings_change_global_error_delegate.h',
|
| 'browser/remove_rows_table_model.h',
|
| 'browser/renderer_host/chrome_render_message_filter.cc',
|
| 'browser/renderer_host/chrome_render_message_filter.h',
|
| @@ -2363,14 +2338,6 @@
|
| '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
|
| ],
|
| }],
|
| - ['branding=="Chrome"', {
|
| - 'sources': [
|
| - 'browser/protector/internal/keys_internal.cc',
|
| - ],
|
| - 'sources!': [
|
| - 'browser/protector/keys.cc',
|
| - ],
|
| - }],
|
| ['debug_devtools==1', {
|
| 'defines': [
|
| 'DEBUG_DEVTOOLS=1',
|
| @@ -2967,26 +2934,6 @@
|
| 'browser/web_resource/plugins_resource_service.h',
|
| ],
|
| }],
|
| - ['enable_protector_service==0', {
|
| - 'sources!': [
|
| - 'browser/protector/base_prefs_change.cc',
|
| - 'browser/protector/base_prefs_change.h',
|
| - 'browser/protector/base_setting_change.cc',
|
| - 'browser/protector/base_setting_change.h',
|
| - 'browser/protector/default_search_provider_change.cc',
|
| - 'browser/protector/prefs_backup_invalid_change.cc',
|
| - 'browser/protector/protected_prefs_watcher.cc',
|
| - 'browser/protector/protected_prefs_watcher.h',
|
| - 'browser/protector/protector_service.cc',
|
| - 'browser/protector/protector_service.h',
|
| - 'browser/protector/protector_service_factory.cc',
|
| - 'browser/protector/protector_service_factory.h',
|
| - 'browser/protector/session_startup_change.cc',
|
| - 'browser/protector/settings_change_global_error.cc',
|
| - 'browser/protector/settings_change_global_error.h',
|
| - 'browser/protector/settings_change_global_error_delegate.h',
|
| - ],
|
| - }],
|
| [ 'use_openssl==1', {
|
| 'sources!': [
|
| 'browser/importer/nss_decryptor.cc',
|
|
|