BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

3 files changed, 11 insertions, 46 deletions

diff --git a/chromium/chrome/installer/installer_tools.gyp b/chromium/chrome/installer/installer_tools.gyp
deleted file mode 100644
index 3033e218e64..00000000000
--- a/chromium/chrome/installer/installer_tools.gyp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2011 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': {
-    'version_py': '<(DEPTH)/build/util/version.py',
-    'version_path': '<(DEPTH)/chrome/VERSION',
-    'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
-    'branding_dir': '<(DEPTH)/chrome/app/theme/<(branding_path_component)',
-    'msvs_use_common_release': 0,
-    'msvs_use_common_linker_extras': 0,
-  },
-  'conditions': [
-    ['OS=="win"', {
-      'targets': [
-        {
-          'target_name': 'validate_installation',
-          'type': 'executable',
-          'dependencies': [
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/chrome/chrome.gyp:installer_util',
-            '<(DEPTH)/chrome/chrome.gyp:installer_util_strings',
-            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
-          ],
-          'include_dirs': [
-            '<(DEPTH)',
-          ],
-          'sources': [
-            'tools/validate_installation.rc',
-            'tools/validate_installation_main.cc',
-            'tools/validate_installation_resource.h',
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/chromium/chrome/installer/mini_installer.gyp b/chromium/chrome/installer/mini_installer.gyp
index 76e72ee30cd..161ca4e03d3 100644
--- a/chromium/chrome/installer/mini_installer.gyp
+++ b/chromium/chrome/installer/mini_installer.gyp
@@ -19,19 +19,19 @@
       ],
       'targets': [
         {
-	  # A target that is outdated if any of the mini_installer test sources
-	  # are modified.
+          # A target that is outdated if any of the mini_installer test sources
+          # are modified.
           'target_name': 'test_installer_sentinel',
           'type': 'none',
           'actions': [
             {
               'action_name': 'touch_sentinel',
-	      'variables': {
-	        'touch_sentinel_py': '../tools/build/win/touch_sentinel.py',
+              'variables': {
+                'touch_sentinel_py': '../tools/build/win/touch_sentinel.py',
               },
               'inputs': [
                 '<@(test_installer_sources)',  # from test_installer.gypi
-	        '<(touch_sentinel_py)',
+                '<(touch_sentinel_py)',
               ],
               'outputs': ['<(SHARED_INTERMEDIATE_DIR)/chrome/installer/test_installer_sentinel'],
               'action': ['python', '<(touch_sentinel_py)', '<@(_outputs)'],
@@ -39,6 +39,7 @@
           ],
         },
         {
+          # GN version: //chrome/installer/mini_installer
           'target_name': 'mini_installer',
           'type': 'executable',
 
@@ -76,6 +77,8 @@
             'mini_installer/mini_string.h',
             'mini_installer/pe_resource.cc',
             'mini_installer/pe_resource.h',
+            'mini_installer/regkey.cc',
+            'mini_installer/regkey.h',
           ],
           'msvs_settings': {
             'VCCLCompilerTool': {
@@ -155,9 +158,6 @@
           'msvs_precompiled_header': '',
           'msvs_precompiled_source': '',
 
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-
           'variables': {
             # Opt out the common compatibility manifest to work around
             # crbug.com/272660.
@@ -194,6 +194,7 @@
           ],
           'actions': [
             {
+              # GN version: //chrome/installer/mini_installer:archive
               'action_name': 'installer_archive',
               'variables': {
                 'create_installer_archive_py_path':
diff --git a/chromium/chrome/installer/mini_installer.gypi b/chromium/chrome/installer/mini_installer.gypi
index b1e5a2b6866..8fb169a910c 100644
--- a/chromium/chrome/installer/mini_installer.gypi
+++ b/chromium/chrome/installer/mini_installer.gypi
@@ -35,6 +35,8 @@
     'mini_installer/mini_string.h',
     'mini_installer/pe_resource.cc',
     'mini_installer/pe_resource.h',
+    'mini_installer/regkey.cc',
+    'mini_installer/regkey.h',
   ],
   # Disable precompiled headers for this project, to avoid
   # linker errors when building with VS 2008.