BASELINE: Update chromium to 45.0.2454.40

Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

3 files changed, 130 insertions, 88 deletions

diff --git a/chromium/cloud_print/cloud_print.gyp b/chromium/cloud_print/cloud_print.gyp
index e54dc86ff2a..a67743850c4 100644
--- a/chromium/cloud_print/cloud_print.gyp
+++ b/chromium/cloud_print/cloud_print.gyp
@@ -10,12 +10,13 @@
       'target_name': 'cloud_print',
       'type': 'none',
       'dependencies': [
-        'service/service.gyp:*',
         'gcp20/prototype/gcp20_device.gyp:*',
+        'service/service.gyp:*',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
+            'service/win/service.gyp:*',
             'virtual_driver/win/install/virtual_driver_install.gyp:*',
             'virtual_driver/win/virtual_driver.gyp:*',
           ],
diff --git a/chromium/cloud_print/service/service.gyp b/chromium/cloud_print/service/service.gyp
index fc680a8efd2..1eb2b238008 100644
--- a/chromium/cloud_print/service/service.gyp
+++ b/chromium/cloud_print/service/service.gyp
@@ -119,92 +119,5 @@
         'win/setup_listener.h',
       ],
     },
-    {
-      'target_name': 'cloud_print_service',
-      'type': 'executable',
-      'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_exe_version.rc',
-        'win/cloud_print_service.cc',
-      ],
-      'includes': [
-        'win/service_resources.gypi'
-      ],
-      'dependencies': [
-        'cloud_print_service_lib',
-      ],
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
-          'UACExecutionLevel': '2', # /level='requireAdministrator'
-          'AdditionalDependencies': [
-              'secur32.lib',
-          ],
-        },
-      },
-    },
-    {
-      'target_name': 'cloud_print_service_config',
-      'type': 'executable',
-      'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_config_exe_version.rc',
-        'win/cloud_print_service_config.cc',
-      ],
-      'includes': [
-        'win/service_resources.gypi'
-      ],
-      'dependencies': [
-        '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
-        'cloud_print_service_lib',
-      ],
-      'msvs_settings': {
-        'VCManifestTool': {
-          'AdditionalManifestFiles': [
-            'common-controls.manifest',
-          ],
-        },
-        'VCLinkerTool': {
-          'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
-          'UACExecutionLevel': '2', # /level='requireAdministrator'
-          'AdditionalDependencies': [
-              'secur32.lib',
-          ],
-        },
-        'conditions': [
-          ['clang==1', {
-            # atlapp.h contains a global "using namespace WTL;".
-            # TODO: Remove once cloud_print_service_config.cc no longer depends
-            # on atlapp.h, http://crbug.com/5027
-            'VCCLCompilerTool': {
-              'AdditionalOptions': ['-Wno-header-hygiene'],
-            },
-          }],
-        ],
-      },
-    },
-    {
-      'target_name': 'cloud_print_service_setup',
-      'type': 'executable',
-      'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_version.rc',
-        'win/installer.cc',
-        'win/installer.h',
-      ],
-      'includes': [
-        'win/service_resources.gypi'
-      ],
-      'dependencies': [
-        '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
-        'cloud_print_service_lib',
-      ],
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
-          'UACExecutionLevel': '2', # /level='requireAdministrator'
-          'AdditionalDependencies': [
-              'secur32.lib',
-          ],
-        },
-      },
-    },
   ],
 }
diff --git a/chromium/cloud_print/service/win/service.gyp b/chromium/cloud_print/service/win/service.gyp
new file mode 100644
index 00000000000..0019b6f1ca9
--- /dev/null
+++ b/chromium/cloud_print/service/win/service.gyp
@@ -0,0 +1,128 @@
+# Copyright (c) 2012 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.
+{
+  'target_defaults': {
+    'variables': {
+      'chromium_code': 1,
+      'enable_wexit_time_destructors': 1,
+    },
+    'include_dirs': [
+      '<(DEPTH)',
+      # To allow including "version.h"
+      '<(SHARED_INTERMEDIATE_DIR)',
+    ],
+    'defines' : [
+      'COMPILE_CONTENT_STATICALLY',
+      'SECURITY_WIN32',
+      'STRICT',
+      '_ATL_APARTMENT_THREADED',
+      '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
+      '_ATL_NO_COM_SUPPORT',
+      '_ATL_NO_AUTOMATIC_NAMESPACE',
+      '_ATL_NO_EXCEPTIONS',
+    ],
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    'msvs_disabled_warnings': [ 4267, ],
+  },
+  'targets': [
+    {
+      'target_name': 'cloud_print_service',
+      'type': 'executable',
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_exe_version.rc',
+        'cloud_print_service.cc',
+      ],
+      'includes': [
+        'service_resources.gypi'
+      ],
+      'dependencies': [
+        '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
+        '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib',
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
+          'UACExecutionLevel': '2', # /level='requireAdministrator'
+          'AdditionalDependencies': [
+              'secur32.lib',
+          ],
+        },
+      },
+    },
+    {
+      'target_name': 'cloud_print_service_config',
+      'type': 'executable',
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_config_exe_version.rc',
+        'cloud_print_service_config.cc',
+      ],
+      'includes': [
+        'service_resources.gypi'
+      ],
+      'dependencies': [
+        '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
+        '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
+        '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib',
+      ],
+      'msvs_settings': {
+        'VCManifestTool': {
+          'AdditionalManifestFiles': [
+            'common-controls.manifest',
+          ],
+        },
+        'VCLinkerTool': {
+          'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
+          'UACExecutionLevel': '2', # /level='requireAdministrator'
+          'AdditionalDependencies': [
+              'secur32.lib',
+          ],
+        },
+        'conditions': [
+          ['clang==1', {
+            # TODO: Remove once cloud_print_service_config.cc no longer depends
+            # on atlapp.h, http://crbug.com/5027
+            'VCCLCompilerTool': {
+              'AdditionalOptions': [
+                # atlapp.h contains a global "using namespace WTL;".
+                '-Wno-header-hygiene',
+                # atlgdi.h does an intentional assignment in an if conditional.
+                '-Wno-parentheses',
+                # atlgdi.h fails with -Wreorder enabled.
+                '-Wno-reorder',
+                # atlgdi.h doesn't use braces around subobject initializers.
+                '-Wno-missing-braces',
+              ],
+            },
+          }],
+        ],
+      },
+    },
+    {
+      'target_name': 'cloud_print_service_setup',
+      'type': 'executable',
+      'sources': [
+        '<(SHARED_INTERMEDIATE_DIR)/cloud_print/cloud_print_service_setup_exe_version.rc',
+        'installer.cc',
+        'installer.h',
+      ],
+      'includes': [
+        'service_resources.gypi'
+      ],
+      'dependencies': [
+        '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
+        '<(DEPTH)/cloud_print/common/common.gyp:cloud_print_install_lib',
+        '<(DEPTH)/cloud_print/service/service.gyp:cloud_print_service_lib',
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'SubSystem': '2',         # Set /SUBSYSTEM:WINDOWS
+          'UACExecutionLevel': '2', # /level='requireAdministrator'
+          'AdditionalDependencies': [
+              'secur32.lib',
+          ],
+        },
+      },
+    },
+  ],
+}