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>

3 files changed, 89 insertions, 1 deletions

diff --git a/chromium/chrome/browser/android/offline_pages/BUILD.gn b/chromium/chrome/browser/android/offline_pages/BUILD.gn
index f906f38a318..e2d35ed1152 100644
--- a/chromium/chrome/browser/android/offline_pages/BUILD.gn
+++ b/chromium/chrome/browser/android/offline_pages/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//third_party/protobuf/proto_library.gni")
 
-# GYP version: chrome/chrome_browser.gypi:offline_pages_proto
 proto_library("offline_pages_proto") {
   sources = [
     "offline_pages.proto",
diff --git a/chromium/chrome/browser/android/vr_shell/BUILD.gn b/chromium/chrome/browser/android/vr_shell/BUILD.gn
new file mode 100644
index 00000000000..f2e1f803d8a
--- /dev/null
+++ b/chromium/chrome/browser/android/vr_shell/BUILD.gn
@@ -0,0 +1,78 @@
+# Copyright 2016 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.
+
+import("//build/config/android/rules.gni")
+import("//chrome/common/features.gni")
+import("//testing/test.gni")
+
+assert(enable_vr_shell && android_java_ui)
+
+static_library("vr_shell") {
+  sources = [
+    "animation.cc",
+    "animation.h",
+    "easing.cc",
+    "easing.h",
+    "ui_elements.cc",
+    "ui_elements.h",
+    "ui_scene.cc",
+    "ui_scene.h",
+    "vr_compositor.cc",
+    "vr_compositor.h",
+    "vr_controller.cc",
+    "vr_controller.h",
+    "vr_gesture.h",
+    "vr_gl_util.cc",
+    "vr_gl_util.h",
+    "vr_input_manager.cc",
+    "vr_input_manager.h",
+    "vr_math.cc",
+    "vr_math.h",
+    "vr_shell.cc",
+    "vr_shell.h",
+    "vr_shell_delegate.cc",
+    "vr_shell_delegate.h",
+    "vr_shell_renderer.cc",
+    "vr_shell_renderer.h",
+  ]
+
+  deps = [
+    ":vr_shell_jni_headers",
+    "//base",
+    "//cc",
+    "//content/public/browser",
+    "//content/public/common",
+    "//device/vr",
+    "//third_party/gvr-android-sdk:libgvr",
+    "//ui/android",
+    "//ui/base",
+    "//ui/gl",
+    "//ui/gl/init",
+  ]
+
+  configs += [ "//third_party/gvr-android-sdk:libgvr_config" ]
+}
+
+generate_jni("vr_shell_jni_headers") {
+  sources = [
+    "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java",
+    "//chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellDelegate.java",
+  ]
+  jni_package = "vr_shell"
+}
+
+test("vr_shell_unittests") {
+  sources = [
+    "ui_elements_unittest.cc",
+    "ui_scene_unittest.cc",
+  ]
+
+  deps = [
+    ":vr_shell",
+    "//base/test:run_all_unittests",
+    "//base/test:test_support",
+    "//testing/gtest",
+    "//ui/gfx/geometry",
+  ]
+}
diff --git a/chromium/chrome/browser/android/webapk/BUILD.gn b/chromium/chrome/browser/android/webapk/BUILD.gn
new file mode 100644
index 00000000000..6bcd0ac4dc4
--- /dev/null
+++ b/chromium/chrome/browser/android/webapk/BUILD.gn
@@ -0,0 +1,11 @@
+# Copyright 2016 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.
+
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("proto") {
+  sources = [
+    "webapk.proto",
+  ]
+}