BASELINE: Update Chromium to 51.0.2704.41

Also adds in all smaller components by reversing logic for exclusion.

Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 39 insertions, 49 deletions

diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp
index a8f27fcc508..e4281e741e1 100644
--- a/chromium/chromeos/chromeos.gyp
+++ b/chromium/chromeos/chromeos.gyp
@@ -28,6 +28,36 @@
       'audio/chromeos_sounds.h',
       'audio/cras_audio_handler.cc',
       'audio/cras_audio_handler.h',
+      'binder/buffer_reader.cc',
+      'binder/buffer_reader.h',
+      'binder/command_broker.cc',
+      'binder/command_broker.h',
+      'binder/command_stream.cc',
+      'binder/command_stream.h',
+      'binder/constants.h',
+      'binder/driver.cc',
+      'binder/driver.h',
+      'binder/ipc_thread.cc',
+      'binder/ipc_thread.h',
+      'binder/local_object.cc',
+      'binder/local_object.h',
+      'binder/object.h',
+      'binder/remote_object.cc',
+      'binder/remote_object.h',
+      'binder/service_manager_proxy.cc',
+      'binder/service_manager_proxy.h',
+      'binder/status.h',
+      'binder/transaction_data.h',
+      'binder/transaction_data_from_driver.cc',
+      'binder/transaction_data_from_driver.h',
+      'binder/transaction_data_reader.cc',
+      'binder/transaction_data_reader.h',
+      'binder/transaction_status.cc',
+      'binder/transaction_status.h',
+      'binder/util.cc',
+      'binder/util.h',
+      'binder/writable_transaction_data.cc',
+      'binder/writable_transaction_data.h',
       'cert_loader.cc',
       'cert_loader.h',
       'chromeos_constants.cc',
@@ -388,38 +418,6 @@
       'tpm/tpm_token_loader.cc',
       'tpm/tpm_token_loader.h'
     ],
-    'chromeos_binder_sources': [
-      'binder/buffer_reader.cc',
-      'binder/buffer_reader.h',
-      'binder/command_broker.cc',
-      'binder/command_broker.h',
-      'binder/command_stream.cc',
-      'binder/command_stream.h',
-      'binder/constants.h',
-      'binder/driver.cc',
-      'binder/driver.h',
-      'binder/ipc_thread.cc',
-      'binder/ipc_thread.h',
-      'binder/local_object.cc',
-      'binder/local_object.h',
-      'binder/object.h',
-      'binder/remote_object.cc',
-      'binder/remote_object.h',
-      'binder/service_manager_proxy.cc',
-      'binder/service_manager_proxy.h',
-      'binder/status.h',
-      'binder/transaction_data.h',
-      'binder/transaction_data_from_driver.cc',
-      'binder/transaction_data_from_driver.h',
-      'binder/transaction_data_reader.cc',
-      'binder/transaction_data_reader.h',
-      'binder/transaction_status.cc',
-      'binder/transaction_status.h',
-      'binder/util.cc',
-      'binder/util.h',
-      'binder/writable_transaction_data.cc',
-      'binder/writable_transaction_data.h',
-    ],
     'chromeos_binder_test_sources': [
       'binder/buffer_reader_unittest.cc',
       'binder/command_broker_unittest.cc',
@@ -511,7 +509,6 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
-        '../base/base.gyp:base_prefs',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
@@ -519,7 +516,9 @@
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:proxy_config',
+        '../components/components.gyp:user_manager',
         '../components/components.gyp:signin_core_account_id',
+        '../components/prefs/prefs.gyp:prefs',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus',
         '../google_apis/google_apis.gyp:google_apis',
@@ -529,7 +528,6 @@
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../url/url.gyp:url_lib',
         'cryptohome_proto',
-        'ime/input_method.gyp:gencode',
         'power_manager_proto',
       ],
       'defines': [
@@ -537,14 +535,9 @@
       ],
       'sources': [ '<@(chromeos_sources)' ],
       'conditions': [
-        ['use_binder == 1', {
-          'sources': [ '<@(chromeos_binder_sources)' ],
-          'conditions': [
-            ['target_arch == "arm" or target_arch == "ia32"', {
-              'defines': [
-                'BINDER_IPC_32BIT',
-              ],
-            }],
+        ['target_arch == "arm" or target_arch == "ia32"', {
+          'defines': [
+            'BINDER_IPC_32BIT',
           ],
         }],
       ],
@@ -591,6 +584,8 @@
         'dbus/services/service_provider_test_helper.h',
         'disks/mock_disk_mount_manager.cc',
         'disks/mock_disk_mount_manager.h',
+        'geolocation/simple_geolocation_request_test_monitor.cc',
+        'geolocation/simple_geolocation_request_test_monitor.h',
         'login/auth/fake_extended_authenticator.cc',
         'login/auth/fake_extended_authenticator.h',
         'login/auth/mock_auth_attempt_state_resolver.cc',
@@ -645,13 +640,14 @@
       'target_name': 'chromeos_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:run_all_unittests',
         '../base/base.gyp:test_support_base',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:proxy_config',
+        '../components/components.gyp:signin_core_account_id',
+        '../components/prefs/prefs.gyp:prefs_test_support',
         '../crypto/crypto.gyp:crypto',
         '../crypto/crypto.gyp:crypto_test_support',
         '../dbus/dbus.gyp:dbus_test_support',
@@ -672,12 +668,6 @@
         '..',
       ],
       'conditions': [
-        [ 'use_allocator!="none"', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator',
-          ],
-          },
-        ],
         ['use_binder == 1', {
           'sources': [ '<@(chromeos_binder_test_sources)' ],
           'conditions': [