BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

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

8 files changed, 24 insertions, 15 deletions

diff --git a/chromium/cloud_print/cloud_print.gyp b/chromium/cloud_print/cloud_print.gyp
index a67743850c4..8da71956bcd 100644
--- a/chromium/cloud_print/cloud_print.gyp
+++ b/chromium/cloud_print/cloud_print.gyp
@@ -7,6 +7,7 @@
   },
   'targets': [
     {
+      # GN version: //cloud_print
       'target_name': 'cloud_print',
       'type': 'none',
       'dependencies': [
@@ -29,6 +30,7 @@
       ],
     },
     {
+      # GN version: //cloud_print:cloud_print_unittests
       'target_name': 'cloud_print_unittests',
       'type': 'executable',
       'sources': [
diff --git a/chromium/cloud_print/cloud_print_resources.gyp b/chromium/cloud_print/cloud_print_resources.gyp
index 4057d23d6f3..aba2e1effdd 100644
--- a/chromium/cloud_print/cloud_print_resources.gyp
+++ b/chromium/cloud_print/cloud_print_resources.gyp
@@ -17,6 +17,9 @@
   ],
   'targets': [
     {
+      # GN: Thes targets for this are split out depending on when the specific
+      # .ver file is used. For example, see:
+      # //cloud_print/sevice/win:exe_version
       'target_name': 'cloud_print_version_resources',
       'type': 'none',
       'variables': {
@@ -65,7 +68,7 @@
             '<(version_path)',
             '<(branding_path)',
             '<(lastchange_path)',
-            '<(DEPTH)/chrome/version.h.in',
+            '<(DEPTH)/chrome/common/chrome_version.h.in',
             'BRANDING',
           ],
           'outputs': [
@@ -78,7 +81,7 @@
             '-f', '<(branding_path)',
             '-f', '<(lastchange_path)',
             '-f', 'BRANDING',
-            '<(DEPTH)/chrome/version.h.in',
+            '<(DEPTH)/chrome/common/chrome_version.h.in',
             '<@(_outputs)',
           ],
           'message': 'Generating version header file: <@(_outputs)',
diff --git a/chromium/cloud_print/common/common.gyp b/chromium/cloud_print/common/common.gyp
index ea4efa3dd43..13351fda8e2 100644
--- a/chromium/cloud_print/common/common.gyp
+++ b/chromium/cloud_print/common/common.gyp
@@ -7,6 +7,7 @@
   },
   'targets': [
     {
+      # GN version: //cloud_print/common:install_utils
       'target_name': 'cloud_print_install_lib',
       'type': 'static_library',
       'dependencies': [
diff --git a/chromium/cloud_print/service/service.gyp b/chromium/cloud_print/service/service.gyp
index 1eb2b238008..b1a83c9ed98 100644
--- a/chromium/cloud_print/service/service.gyp
+++ b/chromium/cloud_print/service/service.gyp
@@ -22,19 +22,14 @@
       '_ATL_NO_AUTOMATIC_NAMESPACE',
       '_ATL_NO_EXCEPTIONS',
     ],
-    'conditions': [
-      ['OS=="win"', {
-        # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-        'msvs_disabled_warnings': [ 4267, ],
-      }],
-    ],
   },
   'targets': [
     {
+      # GN version: //cloud_print/service:resources
       'target_name': 'service_resources',
       'type': 'none',
       'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cloud_print',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/cloud_print/service',
       },
       'actions': [
         {
@@ -48,12 +43,14 @@
       'includes': [ '../../build/grit_target.gypi' ],
     },
     {
+      # GN version: //cloud_print/service
       'target_name': 'cloud_print_service_lib',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_static',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/components/components.gyp:browser_sync_common',
         '<(DEPTH)/components/components.gyp:cloud_devices_common',
         '<(DEPTH)/google_apis/google_apis.gyp:google_apis',
         '<(DEPTH)/ipc/ipc.gyp:ipc',
@@ -64,9 +61,9 @@
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
             '<(DEPTH)/chrome/chrome.gyp:launcher_support',
             '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+            '<(DEPTH)/chrome/common_constants.gyp:version_header',
           ],
         }],
         ['OS=="win" and clang==1', {
diff --git a/chromium/cloud_print/service/win/service.gyp b/chromium/cloud_print/service/win/service.gyp
index 0019b6f1ca9..5434c497159 100644
--- a/chromium/cloud_print/service/win/service.gyp
+++ b/chromium/cloud_print/service/win/service.gyp
@@ -22,11 +22,10 @@
       '_ATL_NO_AUTOMATIC_NAMESPACE',
       '_ATL_NO_EXCEPTIONS',
     ],
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    'msvs_disabled_warnings': [ 4267, ],
   },
   'targets': [
     {
+      # GN version: //cloud_print/service/win:cloud_print_service
       'target_name': 'cloud_print_service',
       'type': 'executable',
       'sources': [
@@ -51,6 +50,7 @@
       },
     },
     {
+      # GN version: //cloud_print/service/win:cloud_print_service_config
       'target_name': 'cloud_print_service_config',
       'type': 'executable',
       'sources': [
@@ -99,6 +99,7 @@
       },
     },
     {
+      # GN version: //cloud_print/service/win:cloud_print_service_setup
       'target_name': 'cloud_print_service_setup',
       'type': 'executable',
       'sources': [
diff --git a/chromium/cloud_print/service/win/service_resources.gypi b/chromium/cloud_print/service/win/service_resources.gypi
index c406feeb895..ea981a793e0 100644
--- a/chromium/cloud_print/service/win/service_resources.gypi
+++ b/chromium/cloud_print/service/win/service_resources.gypi
@@ -1,5 +1,5 @@
 {
   'sources': [
-    '<(SHARED_INTERMEDIATE_DIR)/cloud_print/service_resources_en.rc',
+    '<(SHARED_INTERMEDIATE_DIR)/cloud_print/service/service_resources_en.rc',
   ],
-}
\ No newline at end of file
+}
diff --git a/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp b/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
index 6b19304816b..a788f1aa38e 100644
--- a/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
+++ b/chromium/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
@@ -13,6 +13,7 @@
   },
   'targets' : [
     {
+      # GN version: //cloud_print/virtual_driver/win/install:virtual_driver_setup
       'target_name': 'virtual_driver_setup',
       'type': 'executable',
       'include_dirs': [
@@ -102,6 +103,7 @@
       ],
     },
     {
+      # GN version: //cloud_print/virtual_driver/win/install:resources
       'target_name': 'virtual_driver_setup_resources',
       'type': 'none',
       'variables': {
diff --git a/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi b/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi
index 41b2a97fe0f..886f746e7d7 100644
--- a/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/chromium/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -16,6 +16,7 @@
   },
   'targets' : [
     {
+      # GN version: //cloud_print/virtual_driver/win
       'target_name': 'virtual_driver_lib<(virtual_driver_suffix)',
       'type': 'static_library',
       'sources': [
@@ -28,6 +29,7 @@
       ],
     },
     {
+      # GN version: //cloud_print/virtual_driver/win/port_monitor:lib
       'target_name': 'gcp_portmon_lib<(virtual_driver_suffix)',
       'type': 'static_library',
       'sources': [
@@ -39,6 +41,7 @@
       ],
     },
     {
+      # GN version: //cloud_print/virtual_driver/win/port_monitor
       'target_name': 'gcp_portmon<(virtual_driver_suffix)',
       'type': 'loadable_module',
       'sources': [
@@ -48,7 +51,7 @@
       ],
       'dependencies': [
         'gcp_portmon_lib<(virtual_driver_suffix)',
-        '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
+        '<(DEPTH)/chrome/common_constants.gyp:version_header',
         '<(DEPTH)/cloud_print/cloud_print_resources.gyp:cloud_print_version_resources',
       ],
       'include_dirs': [