BASELINE: Update chromium to 44.0.2403.47

Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

4 files changed, 68 insertions, 14 deletions

diff --git a/chromium/chrome/tools/build/repack_locales.py b/chromium/chrome/tools/build/repack_locales.py
index a5a8e9fc56a..b953bb8818a 100755
--- a/chromium/chrome/tools/build/repack_locales.py
+++ b/chromium/chrome/tools/build/repack_locales.py
@@ -33,7 +33,6 @@ OS = None
 CHROMEOS = False
 
 USE_ASH = False
-USE_ATHENA = False
 ENABLE_AUTOFILL_DIALOG = False
 ENABLE_EXTENSIONS = False
 
@@ -89,11 +88,6 @@ def calc_inputs(locale):
     inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings',
                   'ash_strings_%s.pak' % locale))
 
-  if USE_ATHENA:
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/athena/strings/athena_strings_da.pak',
-    inputs.append(os.path.join(SHARE_INT_DIR, 'athena', 'strings',
-                  'athena_strings_%s.pak' % locale))
-
   if CHROMEOS:
     inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'chromeos', 'strings',
                   'ui_chromeos_strings_%s.pak' % locale))
@@ -114,7 +108,12 @@ def calc_inputs(locale):
     inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings',
                   'app_locale_settings_%s.pak' % locale))
 
-  if ENABLE_AUTOFILL_DIALOG and OS != 'ios' and OS != 'android':
+  else:
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_strings_resources_da.pak'
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome',
+                  'ios_strings_resources_%s.pak' % locale))
+
+  if ENABLE_AUTOFILL_DIALOG:
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/
     # address_input_strings_da.pak',
     inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput',
@@ -191,7 +190,6 @@ def DoMain(argv):
   global OS
   global CHROMEOS
   global USE_ASH
-  global USE_ATHENA
   global WHITELIST
   global ENABLE_AUTOFILL_DIALOG
   global ENABLE_EXTENSIONS
@@ -217,8 +215,6 @@ def DoMain(argv):
                     help="The target OS. (e.g. mac, linux, win, etc.)")
   parser.add_option("--use-ash", action="store", dest="use_ash",
                     help="Whether to include ash strings")
-  parser.add_option("--use-athena", action="store", dest="use_athena",
-                    help="Whether to include athena strings")
   parser.add_option("--chromeos", action="store",
                     help="Whether building for Chrome OS")
   parser.add_option("--whitelist", action="store", help="Full path to the "
@@ -244,7 +240,6 @@ def DoMain(argv):
   OS = options.os
   CHROMEOS = options.chromeos == '1'
   USE_ASH = options.use_ash == '1'
-  USE_ATHENA = options.use_athena == '1'
   WHITELIST = options.whitelist
   ENABLE_AUTOFILL_DIALOG = options.enable_autofill_dialog == '1'
   ENABLE_EXTENSIONS = options.enable_extensions == '1'
diff --git a/chromium/chrome/tools/convert_dict/convert_dict.gyp b/chromium/chrome/tools/convert_dict/convert_dict.gyp
index 973d8f51fca..dc1ef8ef235 100644
--- a/chromium/chrome/tools/convert_dict/convert_dict.gyp
+++ b/chromium/chrome/tools/convert_dict/convert_dict.gyp
@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //chrome/tools/convert_dict:lib
       'target_name': 'convert_dict_lib',
       'product_name': 'convert_dict',
       'type': 'static_library',
@@ -34,7 +35,7 @@
       'dependencies': [
         '../../../base/base.gyp:base',
         '../../../base/base.gyp:base_i18n',
-        '../../../third_party/hunspell/hunspell.gyp:hunspell',
+        '../../../third_party/hunspell_new/hunspell.gyp:hunspell',
         'convert_dict_lib',
       ],
       'sources': [
diff --git a/chromium/chrome/tools/crash_service/caps/caps.gyp b/chromium/chrome/tools/crash_service/caps/caps.gyp
new file mode 100644
index 00000000000..9379c520d01
--- /dev/null
+++ b/chromium/chrome/tools/crash_service/caps/caps.gyp
@@ -0,0 +1,56 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'includes': [
+    '../../../../build/util/version.gypi',
+    '../../../../build/win_precompile.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'caps_resources',
+      'type': 'none',
+      'variables': {
+        'branding_path': '../../../app/theme/<(branding_path_component)/BRANDING',
+        'output_dir': 'caps',
+        'template_input_path': '../../../app/chrome_version.rc.version',
+      },
+      'sources': [
+        'caps.ver',
+      ],
+      'includes': [
+        '../../../version_resource_rules.gypi',
+      ],
+    },
+    {
+      'target_name': 'caps',
+      'type': 'executable',
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/caps/caps_version.rc',
+        'exit_codes.h',
+        'logger_win.cc',
+        'logger_win.h',
+        'main_win.cc',
+        'process_singleton_win.cc',
+        'process_singleton_win.h',
+      ],
+      'dependencies': [
+        'caps_resources',
+        '../../../../base/base.gyp:base',
+        '../../../../chrome/chrome.gyp:common_version',
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          # Set /SUBSYSTEM:WINDOWS.
+          'SubSystem': '2',
+        },
+      },
+    },
+  ],
+}
diff --git a/chromium/chrome/tools/profile_reset/jtl_compiler.gyp b/chromium/chrome/tools/profile_reset/jtl_compiler.gyp
index f351387bc65..40dca37daa3 100644
--- a/chromium/chrome/tools/profile_reset/jtl_compiler.gyp
+++ b/chromium/chrome/tools/profile_reset/jtl_compiler.gyp
@@ -4,6 +4,7 @@
   },
   'targets': [
     {
+      # GN version: //chrome/tools/profile_reset:jtl_compiler
       'target_name': 'jtl_compiler',
       'type': 'executable',
       'dependencies': [
@@ -18,6 +19,7 @@
       ],
     },
     {
+      # GN version: //chrome/tools/profile_reset:jtl_compiler_lib
       'target_name': 'jtl_compiler_lib',
       'type': 'static_library',
       'product_name': 'jtl_compiler',
@@ -28,10 +30,10 @@
       'sources': [
         '../../browser/profile_resetter/jtl_foundation.h',
         '../../browser/profile_resetter/jtl_instructions.h',
-        'jtl_compiler.h',
         'jtl_compiler.cc',
-        'jtl_parser.h',
+        'jtl_compiler.h',
         'jtl_parser.cc',
+        'jtl_parser.h',
       ],
     },
   ],