Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

5 files changed, 87 insertions, 74 deletions

diff --git a/chromium/native_client/src/trusted/service_runtime/service_runtime.gyp b/chromium/native_client/src/trusted/service_runtime/service_runtime.gyp
index f102438b9e9..841fba051f7 100644
--- a/chromium/native_client/src/trusted/service_runtime/service_runtime.gyp
+++ b/chromium/native_client/src/trusted/service_runtime/service_runtime.gyp
@@ -48,7 +48,9 @@
           'nacl_globals.c',
           'nacl_kernel_service.c',
           'nacl_resource.c',
+          'nacl_reverse_host_interface.c',
           'nacl_reverse_quota_interface.c',
+          'nacl_runtime_host_interface.c',
           'nacl_secure_service.c',
           'nacl_signal_common.c',
           'nacl_stack_safety.c',
@@ -69,7 +71,12 @@
           'sel_mem.c',
           'sel_qualify.c',
           'sel_validate_image.c',
+          'sys_exception.c',
+          'sys_fdio.c',
+          'sys_filename.c',
+          'sys_imc.c',
           'sys_list_mappings.c',
+          'sys_memory.c',
           'thread_suspension_common.c',
           'thread_suspension_unwind.c',
         ],
@@ -310,6 +317,7 @@
       ],
       'sources': [
         'nacl_test_injection_main.c',
+        'force_cpp.cc',
       ],
       'conditions': [
         ['OS=="linux"', {
diff --git a/chromium/native_client/src/trusted/validator_arm/validator_arm.gyp b/chromium/native_client/src/trusted/validator_arm/validator_arm.gyp
index b22b2f9b721..0b1877b8876 100644
--- a/chromium/native_client/src/trusted/validator_arm/validator_arm.gyp
+++ b/chromium/native_client/src/trusted/validator_arm/validator_arm.gyp
@@ -59,7 +59,8 @@
       'type': 'static_library',
       'sources': [ 'ncvalidate.cc' ],
       'dependencies': [
-        'arm_validator_core'
+        'arm_validator_core',
+        '<(DEPTH)/native_client/src/trusted/validator/validator.gyp:validation_cache',
       ],
     },
     # ----------------------------------------------------------------------
diff --git a/chromium/native_client/src/untrusted/irt/check_tls.gypi b/chromium/native_client/src/untrusted/irt/check_tls.gypi
index e8fe5653fee..bd0aebe8523 100644
--- a/chromium/native_client/src/untrusted/irt/check_tls.gypi
+++ b/chromium/native_client/src/untrusted/irt/check_tls.gypi
@@ -46,7 +46,7 @@
             ['target_arch=="arm"', {
               'variables': {
                 'nacl_objdump':
-                  '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_x86_pnacl/host_x86_32/bin/le32-nacl-objdump',
+                  '<(SHARED_INTERMEDIATE_DIR)/sdk/toolchain/<(OS)_pnacl/host_x86_32/bin/le32-nacl-objdump',
               },
             }, {
               # target_arch!="arm", so it's x86.
diff --git a/chromium/native_client/src/untrusted/nacl/nacl.gyp b/chromium/native_client/src/untrusted/nacl/nacl.gyp
index 72617ad7f33..c30499756fc 100644
--- a/chromium/native_client/src/untrusted/nacl/nacl.gyp
+++ b/chromium/native_client/src/untrusted/nacl/nacl.gyp
@@ -48,6 +48,66 @@
       'unlink.c',
       'write.c',
     ],
+    'sources_for_stubs': [
+      'stubs/access.c',
+      'stubs/chmod.c',
+      'stubs/chown.c',
+      'stubs/endpwent.c',
+      'stubs/environ.c',
+      'stubs/_execve.c',
+      'stubs/fcntl.c',
+      'stubs/fchdir.c',
+      'stubs/fchmod.c',
+      'stubs/fchown.c',
+      'stubs/fdatasync.c',
+      'stubs/fork.c',
+      'stubs/fsync.c',
+      'stubs/ftruncate.c',
+      'stubs/get_current_dir_name.c',
+      'stubs/getegid.c',
+      'stubs/geteuid.c',
+      'stubs/getgid.c',
+      'stubs/getlogin.c',
+      'stubs/getrusage.c',
+      'stubs/getppid.c',
+      'stubs/getpwent.c',
+      'stubs/getpwnam.c',
+      'stubs/getpwnam_r.c',
+      'stubs/getpwuid.c',
+      'stubs/getpwuid_r.c',
+      'stubs/getuid.c',
+      'stubs/getwd.c',
+      'stubs/ioctl.c',
+      'stubs/issetugid.c',
+      'stubs/kill.c',
+      'stubs/lchown.c',
+      'stubs/link.c',
+      'stubs/llseek.c',
+      'stubs/lstat.c',
+      'stubs/pipe.c',
+      'stubs/pselect.c',
+      'stubs/readlink.c',
+      'stubs/select.c',
+      'stubs/setegid.c',
+      'stubs/seteuid.c',
+      'stubs/setgid.c',
+      'stubs/setpwent.c',
+      'stubs/settimeofday.c',
+      'stubs/setuid.c',
+      'stubs/signal.c',
+      'stubs/sigprocmask.c',
+      'stubs/symlink.c',
+      'stubs/times.c',
+      'stubs/truncate.c',
+      'stubs/ttyname.c',
+      'stubs/ttyname_r.c',
+      'stubs/umask.c',
+      'stubs/utime.c',
+      'stubs/utimes.c',
+      'stubs/vfork.c',
+      'stubs/wait.c',
+      'stubs/waitpid.c',
+    ],
     'sources_for_nacl_extensions': [
       'gc_hooks.c',
       'nacl_irt.c',
@@ -109,6 +169,7 @@
       'sources': [
         '<@(sources_for_nacl_extensions)',
         '<@(sources_for_standard_interfaces)',
+        '<@(sources_for_stubs)',
       ],
       'conditions': [
         ['target_arch=="arm"', {
@@ -168,6 +229,20 @@
       ],
     },
     {
+      'target_name': 'nacl_exception_private_lib',
+      'type': 'none',
+      'variables': {
+        'nlib_target': 'libnacl_exception_private.a',
+        'build_glibc': 1,
+        'build_newlib': 1,
+        'build_pnacl_newlib': 1,
+      },
+      'sources': ['nacl_exception_private.c'],
+      'dependencies': [
+        '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
+      ],
+    },
+    {
       'target_name': 'nacl_list_mappings_lib',
       'type': 'none',
       'variables': {
diff --git a/chromium/native_client/src/untrusted/nosys/nosys.gyp b/chromium/native_client/src/untrusted/nosys/nosys.gyp
index 8b5df97195a..4cb2d2cc494 100644
--- a/chromium/native_client/src/untrusted/nosys/nosys.gyp
+++ b/chromium/native_client/src/untrusted/nosys/nosys.gyp
@@ -7,10 +7,6 @@
   'includes': [
     '../../../build/common.gypi',
   ],
-  'variables': {
-    'common_sources': [
-    ],
-  },
   'targets' : [
     {
       'target_name': 'nosys_lib',
@@ -21,74 +17,7 @@
         'build_newlib': 1,
         'build_pnacl_newlib': 1,
       },
-      'sources': [
-        'access.c',
-        'chmod.c',
-        'chown.c',
-        'endpwent.c',
-        'environ.c',
-        'execve.c',
-        '_execve.c',
-        'fcntl.c',
-        'fchdir.c',
-        'fchmod.c',
-        'fchown.c',
-        'fdatasync.c',
-        'fork.c',
-        'fsync.c',
-        'ftruncate.c',
-        'get_current_dir_name.c',
-        'getegid.c',
-        'geteuid.c',
-        'getgid.c',
-        'getlogin.c',
-        'getrusage.c',
-        'getppid.c',
-        'getpwent.c',
-        'getpwnam.c',
-        'getpwnam_r.c',
-        'getpwuid.c',
-        'getpwuid_r.c',
-        'getuid.c',
-        'getwd.c',
-        'ioctl.c',
-        'issetugid.c',
-        'isatty.c',
-        'kill.c',
-        'lchown.c',
-        'link.c',
-        'llseek.c',
-        'lstat.c',
-        'pclose.c',
-        'pipe.c',
-        'popen.c',
-        'pselect.c',
-        'readlink.c',
-        'remove.c',
-        'rename.c',
-        'select.c',
-        'setegid.c',
-        'seteuid.c',
-        'setgid.c',
-        'setpwent.c',
-        'settimeofday.c',
-        'setuid.c',
-        'signal.c',
-        'sigprocmask.c',
-        'symlink.c',
-        'system.c',
-        'times.c',
-        'tmpfile.c',
-        'truncate.c',
-        'ttyname.c',
-        'ttyname_r.c',
-        'umask.c',
-        'utime.c',
-        'utimes.c',
-        'vfork.c',
-        'wait.c',
-        'waitpid.c',
-      ],
+      'sources': [],
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ],