Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d

23 files changed, 119 insertions, 78 deletions

diff --git a/build/all.gyp b/build/all.gyp
index 43ac284e51..d427a10006 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -75,6 +75,7 @@
         }, { #  'OS=="ios"'
           'dependencies': [
             '../ios/ios.gyp:*',
+            '../ui/ui_unittests.gyp:ui_unittests',
           ],
         }],
         ['OS!="android" and OS!="ios"', {
@@ -369,6 +370,18 @@
             '../third_party/WebKit/public/all.gyp:all_blink',
             '../content/content_shell_and_tests.gyp:content_shell',
           ],
+          'conditions': [
+            ['OS=="win"', {
+              'dependencies': [
+                '../content/content_shell_and_tests.gyp:content_shell_crash_service',
+              ],
+            }, {  # OS!="win"
+              'dependencies': [
+                '../breakpad/breakpad.gyp:dump_syms',
+                '../breakpad/breakpad.gyp:minidump_stackwalk',
+              ],
+            }],
+          ],
         }, # target_name: all_webkit
         {
           'target_name': 'chromium_builder_nacl_win_integration',
diff --git a/build/all_android.gyp b/build/all_android.gyp
index d8557500be..bfca854067 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -36,6 +36,8 @@
       'dependencies': [
         '../third_party/WebKit/public/all.gyp:all_blink',
         '../content/content_shell_and_tests.gyp:content_shell_apk',
+        '../breakpad/breakpad.gyp:dump_syms#host',
+        '../breakpad/breakpad.gyp:minidump_stackwalk#host',
       ],
     }, # target_name: all_webkit
     {
diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py
index a021bfc892..67020d6327 100755
--- a/build/android/buildbot/bb_device_status_check.py
+++ b/build/android/buildbot/bb_device_status_check.py
@@ -256,8 +256,11 @@ def RestartUsb():
 def KillAllAdb():
   def GetAllAdb():
     for p in psutil.process_iter():
-      if 'adb' in p.name or 'adb' in ' '.join(p.cmdline):
-        yield p
+      try:
+        if 'adb' in p.name:
+          yield p
+      except psutil.error.NoSuchProcess:
+        pass
 
   for sig in [signal.SIGTERM, signal.SIGQUIT, signal.SIGKILL]:
     for p in GetAllAdb():
@@ -268,7 +271,10 @@ def KillAllAdb():
       except psutil.error.NoSuchProcess:
         pass
   for p in GetAllAdb():
-    print 'Unable to kill %d (%s [%s])' % (p.pid, p.name, ' '.join(p.cmdline))
+    try:
+      print 'Unable to kill %d (%s [%s])' % (p.pid, p.name, ' '.join(p.cmdline))
+    except psutil.error.NoSuchProcess:
+      pass
 
 
 def main():
diff --git a/build/android/finalize_apk_action.gypi b/build/android/finalize_apk_action.gypi
index 5ee6043b4e..b88bbba2cc 100644
--- a/build/android/finalize_apk_action.gypi
+++ b/build/android/finalize_apk_action.gypi
@@ -18,7 +18,7 @@
 #
 
 {
-  'message': 'Signing/aligning <(_target_name) APK: <(input_apk_path).',
+  'message': 'Signing/aligning <(_target_name) APK: <(input_apk_path)',
   'variables': {
     'inputs': [],
     'keystore_path%': '<(DEPTH)/build/android/ant/chromium-debug.keystore',
diff --git a/build/android/findbugs_filter/findbugs_known_bugs.txt b/build/android/findbugs_filter/findbugs_known_bugs.txt
index a2be5f1ad5..b2375f84cb 100644
--- a/build/android/findbugs_filter/findbugs_known_bugs.txt
+++ b/build/android/findbugs_filter/findbugs_known_bugs.txt
@@ -1,10 +1,6 @@
 H C EC: Using pointer equality to compare a JavaBridgeCoercionTest$CustomType with a JavaBridgeCoercionTest$CustomType2 in org.chromium.content.browser.JavaBridgeCoercionTest.testPassJavaObject()  At JavaBridgeCoercionTest.java
 M B DE: org.chromium.net.X509Util.clearTestRootCertificates() might ignore java.io.IOException  At X509Util.java
 M B Nm: The method name org.chromium.base.test.util.ScalableTimeout.ScaleTimeout(long) doesn't start with a lower case letter  At ScalableTimeout.java
-M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.android_webview.test.ArchiveTest.doArchiveTest(AwContents, String, boolean, String)  At ArchiveTest.java
-M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.android_webview.test.ArchiveTest.testAutoBadPath()  At ArchiveTest.java
-M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.android_webview.test.ArchiveTest.testExplicitBadPath()  At ArchiveTest.java
-M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.android_webview.test.ArchiveTest.testExplicitGoodPath()  At ArchiveTest.java
 M B RV: exceptional return value of java.io.File.delete() ignored in org.chromium.base.test.util.TestFileUtil.deleteFile(String)  At TestFileUtil.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At HttpAuthDatabase.java
 M C CSM: Shouldn't use synchronized method, please narrow down the synchronization scope.  At JavaBridgeArrayCoercionTest.java
diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled
index 535711bb7b..62bc394655 100644
--- a/build/android/pylib/gtest/filter/content_browsertests_disabled
+++ b/build/android/pylib/gtest/filter/content_browsertests_disabled
@@ -70,6 +70,7 @@ WebrtcBrowserTest.CanForwardRemoteStream720p
 WebrtcBrowserTest.CanSetupVideoCall
 WebrtcBrowserTest.CanSetupAudioAndVideoCall
 WebrtcBrowserTest.CanSetupAudioAndVideoCallWithoutMsidAndBundle
+WebrtcBrowserTest.CanSetupLegacyCall
 WebrtcBrowserTest.CallWithDataOnly
 WebrtcBrowserTest.CallWithDataAndMedia
 WebrtcBrowserTest.CanMakeEmptyCallThenAddStreamsAndRenegotiate
diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py
index 4508d7ce75..da3dc66da4 100644
--- a/build/android/pylib/gtest/setup.py
+++ b/build/android/pylib/gtest/setup.py
@@ -87,7 +87,7 @@ _DEPS_EXCLUSION_LIST = [
 ]
 
 _ISOLATE_SCRIPT = os.path.join(
-    constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py')
+    constants.DIR_SOURCE_ROOT, 'tools', 'swarming_client', 'isolate.py')
 
 
 def _GenerateDepsDirUsingIsolate(suite_name):
diff --git a/build/android/write_ordered_libraries.gypi b/build/android/write_ordered_libraries.gypi
index 2b2450097d..e9b8ba5379 100644
--- a/build/android/write_ordered_libraries.gypi
+++ b/build/android/write_ordered_libraries.gypi
@@ -20,7 +20,7 @@
 
 {
   'action_name': 'ordered_libraries_<(_target_name)',
-  'message': 'Writing dependency ordered libraries for <(_target_name).',
+  'message': 'Writing dependency ordered libraries for <(_target_name)',
   'variables': {
     'input_libraries%': [],
   },
diff --git a/build/common.gypi b/build/common.gypi
index 869696bf9a..06306c8934 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -438,6 +438,7 @@
       # Platform sends memory pressure signals natively.
       'native_memory_pressure_signals%': 0,
 
+      'data_reduction_fallback_host%' : '',
       'spdy_proxy_auth_origin%' : '',
       'spdy_proxy_auth_property%' : '',
       'spdy_proxy_auth_value%' : '',
@@ -698,7 +699,7 @@
         # Whether tests targets should be run, archived or just have the
         # dependencies verified. All the tests targets have the '_run' suffix,
         # e.g. base_unittests_run runs the target base_unittests. The test
-        # target always calls tools/swarm_client/isolate.py. See the script's
+        # target always calls tools/swarming_client/isolate.py. See the script's
         # --help for more information and the valid --mode values. Meant to be
         # overriden with GYP_DEFINES.
         # TODO(maruel): Remove the conditions as more configurations are
@@ -886,6 +887,7 @@
     'enable_managed_users%': '<(enable_managed_users)',
     'native_discardable_memory%': '<(native_discardable_memory)',
     'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',
+    'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',
     'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',
     'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
     'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
@@ -1792,6 +1794,15 @@
       [ 'chromeos==1', {
         'use_brlapi%': 1,
       }],
+
+      ['use_ozone==1', {
+        # This is the default platform
+        'ozone_platform%': "test",
+
+        # Enable built-in ozone platforms if ozone is enabled.
+        'ozone_platform_dri%': 1,
+        'ozone_platform_test%': 1,
+      }],
     ],
 
 
@@ -1891,7 +1902,7 @@
       'nacl_untrusted_build%': 0,
 
       'pnacl_compile_flags': [
-        # pnacl uses the clang compiler so we need to supress all the
+        # pnacl uses the clang compiler so we need to suppress all the
         # same warnings as we do for clang.
         # TODO(sbc): Remove these if/when they are removed from the clang
         # build.
@@ -2335,6 +2346,10 @@
       ['enable_managed_users==1', {
         'defines': ['ENABLE_MANAGED_USERS=1'],
       }],
+      ['data_reduction_fallback_host != ""', {
+        'defines': [
+          'DATA_REDUCTION_FALLBACK_HOST="<(data_reduction_fallback_host)"'],
+      }],
       ['spdy_proxy_auth_origin != ""', {
         'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],
       }],
@@ -2722,13 +2737,17 @@
           ['win_use_allocator_shim==0', {
             'defines': ['NO_TCMALLOC'],
           }],
-          ['os_posix==1 and chromium_code==1', {
-            # Non-chromium code is not guaranteed to compile cleanly
-            # with _FORTIFY_SOURCE. Also, fortified build may fail
-            # when optimizations are disabled, so only do that for Release
-            # build.
-            'defines': [
-              '_FORTIFY_SOURCE=2',
+          ['os_posix==1', {
+            'target_conditions': [
+              ['chromium_code==1', {
+                # Non-chromium code is not guaranteed to compile cleanly
+                # with _FORTIFY_SOURCE. Also, fortified build may fail
+                # when optimizations are disabled, so only do that for Release
+                # build.
+                'defines': [
+                  '_FORTIFY_SOURCE=2',
+                ],
+              }],
             ],
           }],
           ['OS=="linux" or OS=="android"', {
@@ -3699,20 +3718,24 @@
                   '-Wno-sign-promo',
                 ],
               }],
-              ['android_webview_build==1 and chromium_code==0', {
-                'cflags': [
-                  # There is a class of warning which:
-                  #  1) Android always enables and also treats as errors
-                  #  2) Chromium ignores in third party code
-                  # So we re-enable those warnings when building Android.
-                  '-Wno-address',
-                  '-Wno-format-security',
-                  '-Wno-return-type',
-                  '-Wno-sequence-point',
+              ['android_webview_build==1', {
+                'target_conditions': [
+                  ['chromium_code==0', {
+                    'cflags': [
+                      # There is a class of warning which:
+                      #  1) Android always enables and also treats as errors
+                      #  2) Chromium ignores in third party code
+                      # So we re-enable those warnings when building Android.
+                      '-Wno-address',
+                      '-Wno-format-security',
+                      '-Wno-return-type',
+                      '-Wno-sequence-point',
+                    ],
+                    'cflags_cc': [
+                      '-Wno-non-virtual-dtor',
+                    ],
+                  }],
                 ],
-                'cflags_cc': [
-                  '-Wno-non-virtual-dtor',
-                ]
               }],
               ['target_arch == "arm"', {
                 'ldflags': [
@@ -4368,20 +4391,23 @@
               '<(windows_driver_kit_path)/inc/atl71',
               '<(windows_driver_kit_path)/inc/mfc42',
             ],
-          }],
-          # Workaround for intsafe in 2010 Express + WDK. ATL code uses
-          # intsafe.h and both intsafe.h and stdint.h define INT8_MIN et al.
-          # We can't use this workaround in third_party code because it has
-          # various levels of intolerance for including stdint.h.
-          ['msvs_express and chromium_code', {
-            'msvs_system_include_dirs': [
-              '<(DEPTH)/build',
+            'target_conditions': [
+              ['chromium_code', {
+                # Workaround for intsafe in 2010 Express + WDK.
+                # ATL code uses intsafe.h and both intsafe.h and stdint.h
+                # define INT8_MIN et al.
+                # We can't use this workaround in third_party code because
+                # it has various levels of intolerance for including stdint.h.
+                'msvs_system_include_dirs': [
+                  '<(DEPTH)/build',
+                ],
+                'msvs_settings': {
+                  'VCCLCompilerTool': {
+                    'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
+                  },
+                },
+              }],
             ],
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'ForcedIncludeFiles': [ 'intsafe_workaround.h', ],
-              },
-            },
           }],
         ],
         'msvs_system_include_dirs': [
@@ -4644,6 +4670,11 @@
           'x86_64'
          ],
       }],
+      ['target_arch=="ia32"', {
+        'ARCHS': [
+          'i386'
+         ],
+      }],
     ],
 
     # The Xcode generator will look for an xcode_settings section at the root
diff --git a/build/extract_from_cab.py b/build/extract_from_cab.py
index 1c928af36f..080370ca9a 100755
--- a/build/extract_from_cab.py
+++ b/build/extract_from_cab.py
@@ -12,7 +12,7 @@ import sys
 import tempfile
 
 def run_quiet(*args):
-  """Run 'expand' supressing noisy output. Returns returncode from process."""
+  """Run 'expand' suppressing noisy output. Returns returncode from process."""
   popen = subprocess.Popen(args, stdout=subprocess.PIPE)
   out, _ = popen.communicate()
   if popen.returncode:
diff --git a/build/gyp_chromium b/build/gyp_chromium
index b165f70530..83bdb5cd28 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -28,10 +28,6 @@ sys.path.insert(1, os.path.join(chrome_src, 'native_client', 'build'))
 sys.path.insert(1, os.path.join(chrome_src, 'remoting', 'tools', 'build'))
 sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
     'Source', 'build', 'scripts'))
-# FIXME schenney: Remove this once we remove Source/core/scripts
-sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
-    'Source', 'core', 'scripts'))
-
 
 # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 6f8b3ffad6..0b35943097 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -100,7 +100,7 @@ dev_list="apache2.2-bin bison curl elfutils fakeroot flex g++ gperf
 # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
 # NaCl binaries. These are always needed, regardless of whether or not we want
 # the full 32-bit "cross-compile" support (--lib32).
-if [ "$(uname -m)" = "x86_64" ]; then
+if file /sbin/init | grep -q 'ELF 64-bit'; then
   dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6"
 fi
 
@@ -240,7 +240,7 @@ fi
 # When cross building for arm on 64-bit systems the host binaries
 # that are part of v8 need to be compiled with -m32 which means
 # that basic multilib support is needed.
-if [ "$(uname -m)" = "x86_64" ]; then
+if file /sbin/init | grep -q 'ELF 64-bit'; then
   arm_list="$arm_list g++-multilib"
 fi
 
@@ -362,7 +362,7 @@ else
 fi
 
 # Install 32bit backwards compatibility support for 64bit systems
-if [ "$(uname -m)" = "x86_64" ]; then
+if file /sbin/init | grep -q 'ELF 64-bit'; then
   if test "$do_inst_lib32" != "1"
   then
     echo "NOTE: If you were expecting the option to install 32bit libs,"
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 76882c786e..0f3c84a008 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -41,9 +41,9 @@
       'extension': 'isolate',
       'inputs': [
         # Files that are known to be involved in this step.
-        '<(DEPTH)/tools/swarm_client/isolate.py',
-        '<(DEPTH)/tools/swarm_client/run_isolated.py',
-        '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
+        '<(DEPTH)/tools/swarming_client/isolate.py',
+        '<(DEPTH)/tools/swarming_client/run_isolated.py',
+        '<(DEPTH)/tools/swarming_client/googletest/run_test_cases.py',
 
         # Disable file tracking by the build driver for now. This means the
         # project must have the proper build-time dependency for their runtime
@@ -64,7 +64,7 @@
         ["test_isolation_outdir==''", {
           'action': [
             'python',
-            '<(DEPTH)/tools/swarm_client/isolate.py',
+            '<(DEPTH)/tools/swarming_client/isolate.py',
             '<(test_isolation_mode)',
             # GYP will eliminate duplicate arguments so '<(PRODUCT_DIR)' cannot
             # be provided twice. To work around this behavior, append '/'.
@@ -84,7 +84,7 @@
         }, {
           'action': [
             'python',
-            '<(DEPTH)/tools/swarm_client/isolate.py',
+            '<(DEPTH)/tools/swarming_client/isolate.py',
             '<(test_isolation_mode)',
             '--outdir', '<(test_isolation_outdir)',
             # See comment above.
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index afc2babcde..2485ed59d8 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -232,7 +232,7 @@
         },
         {
           'action_name': 'native_libraries_template_data_<(_target_name)',
-          'message': 'Creating native_libraries_list.h for <(_target_name).',
+          'message': 'Creating native_libraries_list.h for <(_target_name)',
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi
index 680a0eebbf..a6c8364d44 100644
--- a/build/jni_generator.gypi
+++ b/build/jni_generator.gypi
@@ -31,6 +31,7 @@
   'variables': {
     'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',
     'jni_generator_jarjar_file%': '',
+    'jni_generator_ptr_type%': 'int',
   },
   'rules': [
     {
@@ -52,6 +53,8 @@
         '<(optimize_jni_generation)',
         '--jarjar',
         '<(jni_generator_jarjar_file)',
+        '--ptr_type',
+        '<(jni_generator_ptr_type)',
       ],
       'message': 'Generating JNI bindings from <(RULE_INPUT_PATH)',
       'process_outputs_as_sources': 1,
diff --git a/build/json_schema_bundle_compile.gypi b/build/json_schema_bundle_compile.gypi
index 3f6021a157..630e9c6ad2 100644
--- a/build/json_schema_bundle_compile.gypi
+++ b/build/json_schema_bundle_compile.gypi
@@ -28,6 +28,7 @@
         '<(api_gen_dir)/model.py',
         '<(api_gen_dir)/util_cc_helper.py',
         '<@(schema_files)',
+        '<@(non_compiled_schema_files)',
       ],
       'outputs': [
         '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.h',
diff --git a/build/linux/install-arm-sysroot.py b/build/linux/install-arm-sysroot.py
index 5ba4411e4d..76d073e47a 100755
--- a/build/linux/install-arm-sysroot.py
+++ b/build/linux/install-arm-sysroot.py
@@ -34,14 +34,9 @@ import sys
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 URL_PREFIX = 'https://commondatastorage.googleapis.com'
 URL_PATH = 'nativeclient-archive2/toolchain'
-REVISION = 12292
+REVISION = 12356
 TARBALL = 'sysroot-arm-trusted.tgz'
 
-# TODO(sbc): remove armel support once the transision to armhf
-# is complete.
-REVISION_ARMEL = 12203
-TARBALL_ARMEL = 'naclsdk_linux_arm-trusted.tgz'
-
 def main(args):
   if '--linux-only' in args:
     # This argument is passed when run from the gclient hooks.
@@ -55,10 +50,7 @@ def main(args):
 
   src_root = os.path.dirname(os.path.dirname(SCRIPT_DIR))
   sysroot = os.path.join(src_root, 'arm-sysroot')
-  if '-gnueabihf-' in os.environ.get('CC', ''):
-    url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL)
-  else:
-    url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION_ARMEL, TARBALL_ARMEL)
+  url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL)
 
   stamp = os.path.join(sysroot, ".stamp")
   if os.path.exists(stamp):
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 68e1c0afeb..4a7e857efc 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -285,7 +285,7 @@
                          'g_settings_get_strv',
                          'g_settings_list_schemas',
               ],
-              'message': 'Generating libgio library loader.',
+              'message': 'Generating libgio library loader',
               'process_outputs_as_sources': 1,
             },
           ],
@@ -471,7 +471,7 @@
                      'brlapi__writeDots',
                      'brlapi__readKey',
           ],
-          'message': 'Generating libbrlapi library loader.',
+          'message': 'Generating libbrlapi library loader',
           'process_outputs_as_sources': 1,
         },
       ],
@@ -562,7 +562,7 @@
                      'pci_fill_info',
                      'pci_lookup_name',
           ],
-          'message': 'Generating libpci library loader.',
+          'message': 'Generating libpci library loader',
           'process_outputs_as_sources': 1,
         },
       ],
@@ -650,7 +650,7 @@
                      'spd_list_modules',
                      'spd_set_output_module',
           ],
-          'message': 'Generating libspeechd library loader.',
+          'message': 'Generating libspeechd library loader',
           'process_outputs_as_sources': 1,
         },
       ],
diff --git a/build/mac/verify_no_objc.sh b/build/mac/verify_no_objc.sh
index 955f9befff..e18a5eafb0 100755
--- a/build/mac/verify_no_objc.sh
+++ b/build/mac/verify_no_objc.sh
@@ -26,10 +26,9 @@
 
 set -eu
 
-otool="${DEVELOPER_BIN_DIR:-/usr/bin}/otool"
 executable="${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}"
 
-if "${otool}" -arch i386 -o "${executable}" | grep -q '^Contents.*section$'; \
+if xcrun otool -arch i386 -o "${executable}" | grep -q '^Contents.*section$'; \
 then
   echo "${0}: ${executable} has an __OBJC,__image_info section" 2>&1
   exit 1
diff --git a/build/shim_headers.gypi b/build/shim_headers.gypi
index 997a4d0b0f..56d8d3a719 100644
--- a/build/shim_headers.gypi
+++ b/build/shim_headers.gypi
@@ -54,7 +54,7 @@
                  '<@(generator_args)',
                  '--generate',
       ],
-      'message': 'Generating <(_target_name) shim headers.',
+      'message': 'Generating <(_target_name) shim headers',
     },
   ],
 }
diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE
index 5481d49d0d..27dda839b6 100644
--- a/build/util/LASTCHANGE
+++ b/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=232015
+LASTCHANGE=232870
diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink
index bd0fa8b2fd..118e873ef8 100644
--- a/build/util/LASTCHANGE.blink
+++ b/build/util/LASTCHANGE.blink
@@ -1 +1 @@
-LASTCHANGE=160934
+LASTCHANGE=161254
diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
index dbe07f12b3..35e800da05 100644
--- a/build/whitespace_file.txt
+++ b/build/whitespace_file.txt
@@ -76,3 +76,4 @@ BEING SURE OF YOURSELF MEANS YOU'RE A FOOL
 AM NOT
 ARE TOO
 IF AT FIRST YOU DON'T SUCCEED: TRY, EXCEPT, FINALLY
+AND THEN, TIME LEAPT BACKWARDS