BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

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

1 files changed, 125 insertions, 27 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index 4308624eddf..e2fdb39d5ee 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -9,57 +9,97 @@
 # file to your new one or GN won't know about it.
 
 import("//build/config/ui.gni")
+if (is_android) {
+  import("//build/config/android/config.gni")
+}
+
+declare_args() {
+  # A list of extra dependencies to add to the root target. This allows a
+  # checkout to add additional targets without explicitly changing any checked-
+  # in files.
+  root_extra_deps = []
+}
 
 # In GN, a "group" is a dummy target that just lists other targets.
 group("root") {
+  # This should not be linked into production and depends on test targets.
+  testonly = true
+
   # Note that some dependencies are commented out. These are things that are
   # currently written but not hooked up to the build yet. They may need to be
   # completed or possibly just tested and then re-enabled.
   deps = [
-    # This is a temporary test of the not-yet-complete NaCl cross-compilation.
-    #"//base(//build/toolchain/nacl:x86_newlib)",
-
-    "//apps/common/api:apps_api",
+    "//apps",
+    "//ash",
     "//cc",
+    "//cc/blink",
+    "//chrome/browser",
+    "//chrome/browser/devtools",
     "//chrome/common",
+    "//chrome/plugin",
+    "//chrome/renderer",
+    "//chrome/utility",
     "//components:all_components",
     "//content",
+    "//content/shell:content_shell",
+    "//content/test:test_support",
     "//crypto",
-    "//extensions/common/api:extensions_api",
-    "//device/usb",
+    "//device/battery",
+    "//device/bluetooth",
+    "//device/nfc",
+    "//extensions/browser",
+    "//extensions/common",
+    "//extensions/common/api",
+    "//extensions/renderer",
     "//gin",
     "//gpu",
     "//google_apis",
+    "//google_apis/gcm",
     "//ipc",
+    "//ipc/mojo",
+    "//jingle:notifier",
+    "//media",
+    "//media/blink",
+    "//media/cast",
+    "//media/mojo",
     "//mojo",
-    "//mojo/common",
-    "//mojo/environment:chromium",
-    "//mojo/service_manager",
-    "//mojo/system",
     "//net",
     "//pdf",
     "//ppapi:ppapi_c",
     "//printing",
+    "//remoting/client/plugin",
     "//sandbox",
     "//sdch",
     "//skia",
+    "//storage/browser",
     "//sql",
+    "//sync",
+    "//third_party/WebKit/public:all_blink",
     "//third_party/angle:translator",
     "//third_party/brotli",
+    "//third_party/cacheinvalidation",
+    "//third_party/cld",
+    "//third_party/cld_2",
     "//third_party/ffmpeg",
     "//third_party/flac",
     "//third_party/harfbuzz-ng",
+    "//third_party/hunspell",
     "//third_party/iccjpeg",
     "//third_party/icu",
     "//third_party/leveldatabase",
+    "//third_party/libphonenumber",
+    "//third_party/libjingle",
     "//third_party/libpng",
+    "//third_party/libsrtp",
     "//third_party/libusb",
     "//third_party/libwebm",
     "//third_party/libwebp",
     "//third_party/libxslt",
+    "//third_party/libvpx",
     "//third_party/libyuv",
     "//third_party/lzma_sdk",
     "//third_party/mesa",
+    "//third_party/opus",
     "//third_party/ots",
     "//third_party/protobuf:protobuf_lite",
     "//third_party/qcms",
@@ -67,28 +107,35 @@ group("root") {
     "//third_party/smhasher:cityhash",
     "//third_party/smhasher:murmurhash3",
     "//third_party/smhasher:pmurhash",
+    "//third_party/snappy",
     "//third_party/speex",
-    "//third_party/WebKit/public:all_blink",
+    "//third_party/usrsctp",
     "//third_party/widevine/cdm:version_h",
+    "//third_party/webrtc",
     "//third_party/zlib",
     "//third_party:jpeg",
     "//tools/gn",
-    "//ui/aura",
+    "//tools/imagediff($host_toolchain)",
     "//ui/accessibility",
+    "//ui/app_list",
+    "//ui/aura",
     "//ui/base",
+    "//ui/display",
     "//ui/events",
     "//ui/gfx",
     "//ui/gl",
+    "//ui/keyboard",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/snapshot",
     "//ui/strings",
     "//ui/surface",
+    "//ui/views",
+    "//ui/views/controls/webview",
+    "//ui/web_dialogs",
     "//url",
     "//v8:v8",
-    "//webkit/browser:storage",
-    "//webkit/child",
-  ]
+  ] + root_extra_deps
 
   if (!is_win) {
     deps += [ "//breakpad:symupload" ]
@@ -102,6 +149,14 @@ group("root") {
     ]
   }
 
+  if (use_x11) {
+    deps += [ "//tools/xdisplaycheck" ]
+  }
+
+  if (use_aura) {
+    deps += [ "//ui/wm" ]
+  }
+
   if (is_win) {
     deps += [
       "//ui/metro_viewer",
@@ -121,40 +176,83 @@ group("root") {
   }
 
   if (is_android) {
+    deps += [
+      "//base/android/linker:chromium_android_linker",
+      "//build/android/rezip",
+      "//third_party/openmax_dl/dl",
+      "//content/shell/android:content_shell_apk",
+      "//chrome/android:chrome_shell_apk",
+      "//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk",
+      "//ui/android:ui_java",
+      "//third_party/android_tools:android_gcm_java",
+      "//third_party/android_tools:uiautomator_java",
+      "//third_party/android_tools:android_support_v13_java",
+      "//third_party/android_tools:android_support_v7_appcompat_java",
+      "//third_party/android_tools:android_support_v7_mediarouter_java",
+      "//third_party/eyesfree:eyesfree_java",
+    ]
+
+    if (has_chrome_android_internal) {
+      deps += [
+        "//clank",
+      ]
+    }
+
     deps -= [
-      "//cc",
-      "//chrome/common",  # Blocked on content.
-      "//content",
-      "//extensions/common/api:extensions_api",
+      "//apps",  # Needs testing.
+      "//chrome/browser",
+      "//chrome/browser/devtools",
+      "//chrome/common",
+      "//chrome/plugin",
+      "//chrome/renderer",
+      "//chrome/utility",
+      "//content/shell:content_shell",
+      "//extensions/browser",
+      "//extensions/common",
+      "//extensions/common/api",
+      "//extensions/renderer",
       "//pdf",  # Not compiled on Android in GYP yet, either.
       "//ppapi:ppapi_c",
-      "//sandbox",
       "//third_party/libusb",
+      "//ui/keyboard",  # Blocked on content.
 
       # Seems to not be compiled on Android. Otherwise it will need a config.h.
       "//third_party/libxslt",
 
+      # Not relevant to Android.
+      "//ash",
       "//tools/gn",
       "//ui/aura",
+      "//ui/display",
+      "//ui/views",
+      "//ui/views/controls/webview",
 
       # Fails on Android for unknown reasons.
       "//third_party/flac",
       "//breakpad:symupload",
 
-      # TODO(brettw) make Blink work on Android.
-      "//third_party/WebKit/public:all_blink",
-
       # Not tested on Android yet:
+      "//google_apis/gcm",
+      "//remoting/client/plugin",
+      "//storage/browser",
+      "//third_party/cld_2",
       "//third_party/ffmpeg",
-      "//webkit/browser:storage",
-      "//webkit/child",
+      "//ui/app_list",
+      "//ui/web_dialogs",
     ]
   }
 
   if (use_ozone) {
     deps += [
-      "//ui/events/ozone:events_ozone",
-      "//ui/events/ozone:events_ozone_evdev",
+      "//ui/ozone",
+      "//ui/ozone/demo",
+    ]
+  }
+
+  # Non-mobile builds.
+  if (!is_android && !is_ios) {
+    deps += [
+      "//device/usb",
     ]
   }
 }