BASELINE: Update Chromium to 59.0.3071.134

Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

5 files changed, 44 insertions, 38 deletions

diff --git a/chromium/build/android/gyp/java_cpp_enum.py b/chromium/build/android/gyp/java_cpp_enum.py
index f6d7ced4f43..3cb70ce8cf1 100755
--- a/chromium/build/android/gyp/java_cpp_enum.py
+++ b/chromium/build/android/gyp/java_cpp_enum.py
@@ -329,17 +329,16 @@ import android.support.annotation.IntDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-public class ${CLASS_NAME} {
-  @IntDef({
+@IntDef({
 ${INT_DEF}
-  })
-  @Retention(RetentionPolicy.SOURCE)
-  public @interface ${ANNOTATION} {}
+})
+@Retention(RetentionPolicy.SOURCE)
+public @interface ${CLASS_NAME} {
 ${ENUM_ENTRIES}
 }
 """)
 
-  enum_template = Template('  public static final int ${NAME} = ${VALUE};')
+  enum_template = Template('  int ${NAME} = ${VALUE};')
   enum_entries_string = []
   enum_names = []
   for enum_name, enum_value in enum_definition.entries.iteritems():
@@ -359,25 +358,20 @@ ${ENUM_ENTRIES}
                 '\n'.join(comments_line_wrapper.wrap(enum_comments)))
         enum_entries_string.append('   */')
     enum_entries_string.append(enum_template.substitute(values))
-    enum_names.append(enum_name)
+    enum_names.append(enum_definition.class_name + '.' + enum_name)
   enum_entries_string = '\n'.join(enum_entries_string)
 
-  enum_names_indent = ' ' * 6
+  enum_names_indent = ' ' * 4
   wrapper = textwrap.TextWrapper(initial_indent = enum_names_indent,
                                  subsequent_indent = enum_names_indent,
                                  width = 100)
   enum_names_string = '\n'.join(wrapper.wrap(', '.join(enum_names)))
 
-  annotation_template = Template('${NAME}Enum')
-  annotation_values = { 'NAME': enum_definition.class_name, }
-  annotation_name = annotation_template.substitute(annotation_values)
-
   values = {
       'CLASS_NAME': enum_definition.class_name,
       'ENUM_ENTRIES': enum_entries_string,
       'PACKAGE': enum_definition.enum_package,
       'INT_DEF': enum_names_string,
-      'ANNOTATION': annotation_name,
       'SCRIPT_NAME': GetScriptName(),
       'SOURCE_PATH': source_path,
       'YEAR': str(date.today().year)
diff --git a/chromium/build/android/gyp/java_cpp_enum_tests.py b/chromium/build/android/gyp/java_cpp_enum_tests.py
index f0018a18f9a..8d9e60de698 100755
--- a/chromium/build/android/gyp/java_cpp_enum_tests.py
+++ b/chromium/build/android/gyp/java_cpp_enum_tests.py
@@ -51,21 +51,20 @@ import android.support.annotation.IntDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-public class ClassName {
-  @IntDef({
-      E1, E2
-  })
-  @Retention(RetentionPolicy.SOURCE)
-  public @interface ClassNameEnum {}
+@IntDef({
+    ClassName.E1, ClassName.E2
+})
+@Retention(RetentionPolicy.SOURCE)
+public @interface ClassName {
   /**
    * %s
    * really really long.
    */
-  public static final int E1 = 1;
+  int E1 = 1;
   /**
    * This is a comment.
    */
-  public static final int E2 = 2 << 2;
+  int E2 = 2 << 2;
 }
 """
     long_comment = ('This is a multiple line comment that is really long. '
diff --git a/chromium/build/android/gyp/push_libraries.py b/chromium/build/android/gyp/push_libraries.py
index 7d904430ccc..1a64f3dc9b0 100755
--- a/chromium/build/android/gyp/push_libraries.py
+++ b/chromium/build/android/gyp/push_libraries.py
@@ -40,7 +40,8 @@ def DoPush(options):
 
     def Push():
       if needs_directory:
-        device.RunShellCommand('mkdir -p ' + options.device_dir)
+        device.RunShellCommand(
+            ['mkdir', '-p', options.device_dir], check_return=True)
         needs_directory[:] = [] # = False
       device.PushChangedFiles([(os.path.abspath(host_path), device_path)])
 
diff --git a/chromium/build/android/gyp/util/proguard_util.py b/chromium/build/android/gyp/util/proguard_util.py
index a965ff33271..6fc57d9f160 100644
--- a/chromium/build/android/gyp/util/proguard_util.py
+++ b/chromium/build/android/gyp/util/proguard_util.py
@@ -15,15 +15,24 @@ class _ProguardOutputFilter(object):
   """
 
   IGNORE_RE = re.compile(
-      r'(?:Pro.*version|Note:|Reading|Preparing|.*:.*(?:MANIFEST\.MF|\.empty))')
+      r'(?:Pro.*version|Note:|Reading|Preparing|ProgramClass:|'
+      '.*:.*(?:MANIFEST\.MF|\.empty))')
 
   def __init__(self):
     self._last_line_ignored = False
+    self._ignore_next_line = False
 
   def __call__(self, output):
     ret = []
     for line in output.splitlines(True):
-      if not line.startswith(' '):
+      if self._ignore_next_line:
+        self._ignore_next_line = False
+        continue
+
+      if '***BINARY RUN STATS***' in line:
+        self._last_line_ignored = True
+        self._ignore_next_line = True
+      elif not line.startswith(' '):
         self._last_line_ignored = bool(self.IGNORE_RE.match(line))
       elif 'You should check if you need to specify' in line:
         self._last_line_ignored = True
@@ -199,4 +208,3 @@ class ProguardCmdBuilder(object):
     }
 
     build_utils.WriteJson(this_info, self._outjar + '.info')
-
diff --git a/chromium/build/android/gyp/write_build_config.py b/chromium/build/android/gyp/write_build_config.py
index b90f06f8d58..2303dc54afc 100755
--- a/chromium/build/android/gyp/write_build_config.py
+++ b/chromium/build/android/gyp/write_build_config.py
@@ -374,6 +374,7 @@ def main(argv):
   direct_library_deps = deps.Direct('java_library')
   all_library_deps = deps.All('java_library')
 
+  direct_resources_deps = deps.Direct('android_resources')
   all_resources_deps = deps.All('android_resources')
   # Resources should be ordered with the highest-level dependency first so that
   # overrides are done correctly.
@@ -432,23 +433,23 @@ def main(argv):
         gradle['dependent_java_projects'].append(c['path'])
 
 
-  if (options.type in ('java_binary', 'java_library') and
-      not options.bypass_platform_checks):
+  if (options.type in ('java_binary', 'java_library')):
     deps_info['requires_android'] = options.requires_android
     deps_info['supports_android'] = options.supports_android
 
-    deps_require_android = (all_resources_deps +
-        [d['name'] for d in all_library_deps if d['requires_android']])
-    deps_not_support_android = (
-        [d['name'] for d in all_library_deps if not d['supports_android']])
+    if not options.bypass_platform_checks:
+      deps_require_android = (all_resources_deps +
+          [d['name'] for d in all_library_deps if d['requires_android']])
+      deps_not_support_android = (
+          [d['name'] for d in all_library_deps if not d['supports_android']])
 
-    if deps_require_android and not options.requires_android:
-      raise Exception('Some deps require building for the Android platform: ' +
-          str(deps_require_android))
+      if deps_require_android and not options.requires_android:
+        raise Exception('Some deps require building for the Android platform: '
+            + str(deps_require_android))
 
-    if deps_not_support_android and options.supports_android:
-      raise Exception('Not all deps support the Android platform: ' +
-          str(deps_not_support_android))
+      if deps_not_support_android and options.supports_android:
+        raise Exception('Not all deps support the Android platform: '
+            + str(deps_not_support_android))
 
   if options.type in ('java_binary', 'java_library', 'android_apk'):
     deps_info['jar_path'] = options.jar_path
@@ -478,8 +479,11 @@ def main(argv):
           c['package_name'] for c in all_resources_deps if 'package_name' in c]
 
   if options.type == 'android_apk':
-    # Apks will get their resources srcjar explicitly passed to the java step.
+    # Apks will get their resources srcjar explicitly passed to the java step
     config['javac']['srcjars'] = []
+    # Gradle may need to generate resources for some apks.
+    gradle['srcjars'] = [
+        c['srcjar'] for c in direct_resources_deps if 'srcjar' in c]
 
   if options.type == 'android_assets':
     all_asset_sources = []