BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 38 insertions, 140 deletions

diff --git a/chromium/apps/BUILD.gn b/chromium/apps/BUILD.gn
index a024fc15d2a..ede4e7e2236 100644
--- a/chromium/apps/BUILD.gn
+++ b/chromium/apps/BUILD.gn
@@ -8,55 +8,49 @@ import("//build/config/ui.gni")
 assert(!is_android && !is_ios)
 
 static_library("apps") {
-  sources = [
-    "app_lifetime_monitor.cc",
-    "app_lifetime_monitor.h",
-    "app_lifetime_monitor_factory.cc",
-    "app_lifetime_monitor_factory.h",
-    "app_load_service.cc",
-    "app_load_service.h",
-    "app_load_service_factory.cc",
-    "app_load_service_factory.h",
-    "app_restore_service.cc",
-    "app_restore_service.h",
-    "app_restore_service_factory.cc",
-    "app_restore_service_factory.h",
-    "browser_context_keyed_service_factories.cc",
-    "browser_context_keyed_service_factories.h",
-    "custom_launcher_page_contents.cc",
-    "custom_launcher_page_contents.h",
-    "launcher.cc",
-    "launcher.h",
-    "metrics_names.h",
-    "saved_files_service.cc",
-    "saved_files_service.h",
-    "saved_files_service_factory.cc",
-    "saved_files_service_factory.h",
-    "switches.cc",
-    "switches.h",
-  ]
+  sources = []
 
-  configs += [ "//build/config/compiler:wexit_time_destructors" ]
+  if (enable_extensions) {
+    sources += [
+      "app_lifetime_monitor.cc",
+      "app_lifetime_monitor.h",
+      "app_lifetime_monitor_factory.cc",
+      "app_lifetime_monitor_factory.h",
+      "app_load_service.cc",
+      "app_load_service.h",
+      "app_load_service_factory.cc",
+      "app_load_service_factory.h",
+      "app_restore_service.cc",
+      "app_restore_service.h",
+      "app_restore_service_factory.cc",
+      "app_restore_service_factory.h",
+      "browser_context_keyed_service_factories.cc",
+      "browser_context_keyed_service_factories.h",
+      "custom_launcher_page_contents.cc",
+      "custom_launcher_page_contents.h",
+      "launcher.cc",
+      "launcher.h",
+      "metrics_names.h",
+      "saved_files_service.cc",
+      "saved_files_service.h",
+      "saved_files_service_factory.cc",
+      "saved_files_service_factory.h",
+      "switches.cc",
+      "switches.h",
+    ]
 
-  deps = [
-    "//chrome/app/theme:theme_resources",
-    "//chrome/browser/extensions",
-    "//chrome/common/extensions/api:api",
-    "//components/web_modal",
-    "//skia",
-  ]
+    configs += [ "//build/config/compiler:wexit_time_destructors" ]
 
-  if (is_chromeos) {
-    #deps += [ "browser_chromeos" ]  TODO(GYP)
-  }
-
-  if (!enable_extensions) {
-    # When extensions are disabled, only the sizer file below is included.
-    deps -= [
+    deps = [
+      "//chrome/app/theme:theme_resources",
       "//chrome/browser/extensions",
-      "//chrome/common/extensions/api:api",
+      "//chrome/common/extensions/api",
+      "//components/web_modal",
+      "//skia",
     ]
-    sources = []
+
+    # TODO: This top level directory should not have an include cycle.
+    allow_circular_includes_from = [ "//chrome/browser/extensions" ]
   }
 
   if (toolkit_views) {
diff --git a/chromium/apps/apps.gypi b/chromium/apps/apps.gypi
deleted file mode 100644
index 130cb8cda20..00000000000
--- a/chromium/apps/apps.gypi
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'targets': [
-    {
-      # GN version: //apps
-      'target_name': 'apps',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      # Since browser and browser_extensions actually depend on each other,
-      # we must omit the dependency from browser_extensions to browser.
-      # However, this means browser_extensions and browser should more or less
-      # have the same dependencies. Once browser_extensions is untangled from
-      # browser, then we can clean up these dependencies.
-      'dependencies': [
-        'browser_extensions',
-        'chrome_resources.gyp:theme_resources',
-        'common/extensions/api/api.gyp:chrome_api',
-        '../skia/skia.gyp:skia',
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(grit_out_dir)',
-      ],
-      'sources': [
-        # Note: file list duplicated in GN build.
-        'app_lifetime_monitor.cc',
-        'app_lifetime_monitor.h',
-        'app_lifetime_monitor_factory.cc',
-        'app_lifetime_monitor_factory.h',
-        'app_load_service.cc',
-        'app_load_service.h',
-        'app_load_service_factory.cc',
-        'app_load_service_factory.h',
-        'app_restore_service.cc',
-        'app_restore_service.h',
-        'app_restore_service_factory.cc',
-        'app_restore_service_factory.h',
-        'browser_context_keyed_service_factories.cc',
-        'browser_context_keyed_service_factories.h',
-        'custom_launcher_page_contents.cc',
-        'custom_launcher_page_contents.h',
-        'launcher.cc',
-        'launcher.h',
-        'metrics_names.h',
-        'saved_files_service.cc',
-        'saved_files_service.h',
-        'saved_files_service_factory.cc',
-        'saved_files_service_factory.h',
-        'switches.cc',
-        'switches.h',
-        'ui/views/app_window_frame_view.cc',
-        'ui/views/app_window_frame_view.h',
-      ],
-      'conditions': [
-        ['chromeos==1',
-          {
-            'dependencies': [
-              'browser_chromeos',
-            ]
-          }
-        ],
-        ['enable_extensions==0',
-          {
-            'dependencies!': [
-              'browser_extensions',
-              'common/extensions/api/api.gyp:chrome_api',
-            ],
-            'sources/': [
-              ['exclude', '.*'],
-            ],
-          }
-        ],
-        ['toolkit_views==1', {
-          'dependencies': [
-            '../ui/strings/ui_strings.gyp:ui_strings',
-            '../ui/views/views.gyp:views',
-          ],
-        }, {  # toolkit_views==0
-          'sources/': [
-            ['exclude', 'ui/views/'],
-          ],
-        }],
-        ['toolkit_views==1 and enable_extensions==1', {
-          'dependencies': [
-            '../extensions/extensions.gyp:extensions_browser',
-          ],
-        }],
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-  ],  # targets
-}