Cleanup: Simplify chrome gyp files.

Review URL: https://chromiumcodereview.appspot.com/11065031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160747 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 12 insertions, 36 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c38cf70..6cd7845 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -67,8 +67,7 @@
           ['chromeos==1', {
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_cros.grd',
-          }],
-          ['chromeos!=1', {
+          }, {  # chromeos==0
             'platform_locale_settings_grd':
                 'app/resources/locale_settings_linux.grd',
           }],
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 39b57ed..5a122d5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1991,7 +1991,7 @@
         'browser/themes/theme_service.h',
         'browser/themes/theme_service_gtk.cc',
         'browser/themes/theme_service_mac.mm',
-        'browser/themes/theme_syncable_service.cc',        
+        'browser/themes/theme_syncable_service.cc',
         'browser/themes/theme_syncable_service.h',
         'browser/thumbnails/render_widget_snapshot_taker.cc',
         'browser/thumbnails/render_widget_snapshot_taker.h',
@@ -2232,10 +2232,6 @@
         }],
         ['chromeos==0', {
           'sources/': [
-            ['exclude', 'browser/download/download_file_picker_chromeos.cc'],
-            ['exclude', 'browser/download/download_file_picker_chromeos.h'],
-            ['exclude', 'browser/download/save_package_file_picker_chromeos.cc'],
-            ['exclude', 'browser/download/save_package_file_picker_chromeos.h'],
             ['exclude', 'browser/extensions/api/input_ime/input_ime_api.cc'],
             ['exclude', 'browser/extensions/api/input_ime/input_ime_api.h'],
             ['exclude', 'browser/extensions/api/terminal/terminal_extension_helper.cc'],
@@ -2244,10 +2240,6 @@
             ['exclude', 'browser/extensions/api/terminal/terminal_private_api.h'],
             ['exclude', 'browser/extensions/extension_input_method_api.cc'],
             ['exclude', 'browser/extensions/extension_input_method_api.h'],
-            ['exclude', 'browser/icon_loader_chromeos.cc'],
-            ['exclude', 'browser/icon_manager_chromeos.cc'],
-            ['exclude', 'browser/media_gallery/mtp_device_delegate_impl_chromeos.cc'],
-            ['exclude', 'browser/media_gallery/mtp_device_delegate_impl_chromeos.h'],
             ['exclude', 'browser/net/gaia/gaia_oauth_consumer.h'],
             ['exclude', 'browser/net/gaia/gaia_oauth_fetcher.cc'],
             ['exclude', 'browser/net/gaia/gaia_oauth_fetcher.h'],
@@ -2269,11 +2261,6 @@
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
             ['exclude', 'browser/renderer_host/offline_resource_throttle.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_throttle.h'],
-            ['exclude', 'browser/speech/extension_api/tts_extension_api_chromeos.cc'],
-            ['exclude', 'browser/system_monitor/media_device_notifications_chromeos.cc'],
-            ['exclude', 'browser/system_monitor/media_device_notifications_chromeos.h'],
-            ['exclude', 'browser/system_monitor/media_transfer_protocol_device_observer_chromeos.cc'],
-            ['exclude', 'browser/system_monitor/media_transfer_protocol_device_observer_chromeos.h'],
           ],
         }, {  # chromeos==1
           'dependencies': [
@@ -2290,13 +2277,13 @@
             ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
             ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
             ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
+            ['exclude', 'browser/platform_util_linux.cc'],
             ['exclude', 'browser/policy/user_cloud_policy_store.cc'],
             ['exclude', 'browser/policy/user_cloud_policy_store.h'],
             ['exclude', 'browser/policy/user_policy_signin_service.cc'],
             ['exclude', 'browser/policy/user_policy_signin_service.h'],
             ['exclude', 'browser/policy/user_policy_signin_service_factory.cc'],
             ['exclude', 'browser/policy/user_policy_signin_service_factory.h'],
-            ['exclude', 'browser/platform_util_linux.cc'],
             ['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'],
             ['exclude', 'browser/system_monitor/removable_device_notifications_linux.cc'],
             ['exclude', 'browser/system_monitor/removable_device_notifications_linux.h'],
@@ -2353,8 +2340,8 @@
             ['OS=="win"', {
               'sources/': [
                 ['exclude', '^browser/background/background_mode_manager_aura.cc'],
-                ['exclude', '^browser/lifetime/application_lifetime_win.cc'],
                 ['exclude', '^browser/fullscreen_win.cc'],
+                ['exclude', '^browser/lifetime/application_lifetime_win.cc'],
               ],
               'dependencies': [
                 '../ui/metro_viewer/metro_viewer.gyp:metro_viewer',
@@ -2813,7 +2800,7 @@
     },
   ],
   'conditions': [
-    ['OS == "android"', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'chrome_browser_jni_headers',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 592fb64..800afc3 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -367,11 +367,7 @@
             '../build/linux/system.gyp:selinux',
           ],
         }],
-        ['chromeos==0', {
-          'sources!': [
-            'common/chrome_version_info_chromeos.cc',
-          ],
-        }, {  # chromeos==1
+        ['chromeos==1', {
           'sources!': [
             'common/chrome_version_info_linux.cc',
           ],
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index cfc5f48..4357e17 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -48,7 +48,7 @@
         {
           'target_name': 'gcapi_test',
           'type': 'executable',
-          'dependencies': [   
+          'dependencies': [
             'common',
             'gcapi_dll',
             'gcapi_lib',
@@ -204,7 +204,7 @@
           },
           'defines': [
               '<@(nacl_win64_defines)',
-          ], 
+          ],
               'dependencies': [
               '<(DEPTH)/base/base.gyp:base_nacl_win64',
           ],
@@ -1076,7 +1076,7 @@
         {
           'target_name': 'gcapi_example',
           'type': 'executable',
-          'dependencies': [   
+          'dependencies': [
             'gcapi_lib',
           ],
           'include_dirs': [
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 867ecaf..2d533a6 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -172,8 +172,7 @@
               ['chromeos==1', {
                 'platform_locale_settings_grd':
                     'app/resources/locale_settings_cros.grd',
-              }],
-              ['chromeos!=1', {
+              }, {  # chromeos==0
                 'platform_locale_settings_grd':
                     'app/resources/locale_settings_linux.grd',
               }],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 31bdc99..aa71558 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -301,8 +301,7 @@
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
-        }],
-        ['chromeos==1', {
+        }, {  # chromeos==1
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../chromeos/chromeos.gyp:chromeos_test_support',
@@ -2298,15 +2297,11 @@
             ['exclude', '^browser/chromeos/'],
             ['exclude', '^browser/net/gaia/gaia_oauth_fetcher_unittest.cc'],
             ['exclude', '^browser/policy/auto_enrollment_client_unittest.cc' ],
-            ['exclude', '^browser/policy/configuration_policy_handler_chromeos_unittest.cc' ],
             ['exclude', '^browser/policy/cros_user_policy_cache_unittest.cc'],
             ['exclude', '^browser/policy/device_policy_cache_unittest.cc'],
             ['exclude', '^browser/policy/device_status_collector_unittest.cc'],
             ['exclude', '^browser/policy/enterprise_install_attributes_unittest.cc' ],
             ['exclude', '^browser/policy/network_configuration_updater_unittest.cc' ],
-            ['exclude', '^browser/policy/user_cloud_policy_store_chromeos_unittest.cc'],
-            ['exclude', '^browser/system_monitor/media_device_notifications_chromeos_unittest.cc'],
-            ['exclude', '^browser/ui/ash/ime_controller_chromeos_unittest.cc'],
             ['exclude', '^browser/ui/webui/chromeos/imageburner/'],
             ['exclude', '^browser/ui/webui/chromeos/login'],
             ['exclude', '^browser/ui/webui/options/chromeos/'],
@@ -3254,7 +3249,7 @@
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],
-        }, { #else: OS == "chromeos"
+        }, { # chromeos==1
           'sources/': [
             # Protector is disabled on CrOS.
             ['exclude', '^browser/protector'],