Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e

5 files changed, 21 insertions, 22 deletions

diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py
index 452eea796c..1df95a31c7 100755
--- a/build/android/buildbot/bb_device_status_check.py
+++ b/build/android/buildbot/bb_device_status_check.py
@@ -45,24 +45,23 @@ def DeviceInfo(serial, options):
   install_output = GetCmdOutput(
     ['%s/build/android/adb_install_apk.py' % constants.DIR_SOURCE_ROOT, '--apk',
      '%s/build/android/CheckInstallApk-debug.apk' % constants.DIR_SOURCE_ROOT])
-  install_speed_found = re.findall('(\d+) KB/s', install_output)
-  if install_speed_found:
-    install_speed = int(install_speed_found[0])
-  else:
-    install_speed = 'Unknown'
-  if 'Error' in battery:
-    ac_power = 'Unknown'
-    battery_level = 'Unknown'
-    battery_temp = 'Unknown'
-  else:
-    ac_power = re.findall('AC powered: (\w+)', battery)[0]
-    battery_level = int(re.findall('level: (\d+)', battery)[0])
-    battery_temp = float(re.findall('temperature: (\d+)', battery)[0]) / 10
-  sub_info = device_adb.GetSubscriberInfo()
-  imei_slice = ''
-  device_id = re.findall('Device ID = (\d+)', sub_info)
-  if device_id and len(device_id):
-    imei_slice = device_id[0][-6:]
+
+  def _GetData(re_expression, line, lambda_function=lambda x:x):
+    if not line:
+      return 'Unknown'
+    found = re.findall(re_expression, line)
+    if found and len(found):
+      return lambda_function(found[0])
+    return 'Unknown'
+
+  install_speed = _GetData('(\d+) KB/s', install_output)
+  ac_power = _GetData('AC powered: (\w+)', battery)
+  battery_level = _GetData('level: (\d+)', battery)
+  battery_temp = _GetData('temperature: (\d+)', battery,
+                          lambda x: float(x) / 10.0)
+  imei_slice = _GetData('Device ID = (\d+)',
+                        device_adb.GetSubscriberInfo(),
+                        lambda x: x[-6:])
   report = ['Device %s (%s)' % (serial, device_type),
             '  Build: %s (%s)' %
               (device_build, device_adb.GetBuildFingerprint()),
diff --git a/build/isolate.gypi b/build/isolate.gypi
index 7b81697d89..15fcf4c7a4 100644
--- a/build/isolate.gypi
+++ b/build/isolate.gypi
@@ -44,7 +44,7 @@
         '<(DEPTH)/tools/swarm_client/isolate.py',
         '<(DEPTH)/tools/swarm_client/isolateserver_archive.py',
         '<(DEPTH)/tools/swarm_client/run_isolated.py',
-        '<(DEPTH)/tools/swarm_client/run_test_cases.py',
+        '<(DEPTH)/tools/swarm_client/googletest/run_test_cases.py',
         '<(DEPTH)/tools/swarm_client/short_expression_finder.py',
         '<(DEPTH)/tools/swarm_client/trace_inputs.py',
 
diff --git a/build/linux/unbundle/v8.gyp b/build/linux/unbundle/v8.gyp
index f7448febf8..9b063473d9 100644
--- a/build/linux/unbundle/v8.gyp
+++ b/build/linux/unbundle/v8.gyp
@@ -26,7 +26,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 {
-  'includes': ['../../build/common.gypi'],
+  'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
   'targets': [
     {
       'target_name': 'v8',
diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE
index 31ae365198..a724abefd0 100644
--- a/build/util/LASTCHANGE
+++ b/build/util/LASTCHANGE
@@ -1 +1 @@
-LASTCHANGE=213605
+LASTCHANGE=213780
diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink
index 39ed5b7860..e5435e24f7 100644
--- a/build/util/LASTCHANGE.blink
+++ b/build/util/LASTCHANGE.blink
@@ -1 +1 @@
-LASTCHANGE=154842
+LASTCHANGE=154965