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>

4 files changed, 42 insertions, 2 deletions

diff --git a/chromium/third_party/widevine/cdm/BRANDING b/chromium/third_party/widevine/cdm/BRANDING
new file mode 100644
index 00000000000..de8979408a2
--- /dev/null
+++ b/chromium/third_party/widevine/cdm/BRANDING
@@ -0,0 +1,3 @@
+PRODUCT_FULLNAME=Widevine Content Decryption Module Adapter
+PRODUCT_SHORTNAME=Widevine CDM Adapter
+PRODUCT_DESCRIPTION=Widevine Content Decryption Module Adapter enables the Widevine CDM to be used by Chrome.
diff --git a/chromium/third_party/widevine/cdm/BUILD.gn b/chromium/third_party/widevine/cdm/BUILD.gn
index 79fad228776..5157e9006a2 100644
--- a/chromium/third_party/widevine/cdm/BUILD.gn
+++ b/chromium/third_party/widevine/cdm/BUILD.gn
@@ -74,8 +74,8 @@ if (widevine_cdm_binary_files == []) {
 source_set("adapter") {
   if (is_chrome_branded) {
     deps = [
-      ":widevine_cdm_version_h",
-      ":widevine_cdm_binaries",
+      ":version_h",
+      ":binaries",
       "//ppapi:ppapi_cpp",
       #'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',  TODO(GYP)
     ]
diff --git a/chromium/third_party/widevine/cdm/widevine_cdm.gyp b/chromium/third_party/widevine/cdm/widevine_cdm.gyp
index 48896c153c4..2ace05fef40 100644
--- a/chromium/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/chromium/third_party/widevine/cdm/widevine_cdm.gyp
@@ -46,10 +46,41 @@
       }],
     ],
   },
+  'includes': [
+    '../../../build/util/version.gypi',
+  ],
+
   # Always provide a target, so we can put the logic about whether there's
   # anything to be done in this file (instead of a higher-level .gyp file).
   'targets': [
     {
+      'target_name': 'widevinecdmadapter_resources',
+      'type': 'none',
+      'conditions': [
+        ['branding == "Chrome"', {
+          'variables': {
+            'branding_path': '../../../chrome/app/theme/google_chrome/BRANDING',
+          },
+        }, { # else branding!="Chrome"
+          'variables': {
+            'branding_path': '../../../chrome/app/theme/chromium/BRANDING',
+          },
+        }],
+      ],
+      'variables': {
+        'output_dir': '.',
+        'template_input_path': '../../../chrome/app/chrome_version.rc.version',
+        'extra_variable_files_arguments': [ '-f', 'BRANDING' ],
+        'extra_variable_files': [ 'BRANDING' ], # NOTE: matches that above
+      },
+      'sources': [
+        'widevinecdmadapter.ver',
+      ],
+      'includes': [
+        '../../../chrome/version_resource_rules.gypi',
+      ],
+    },
+    {
       # GN version: //third_party/widevine/cdm:adapter
       'target_name': 'widevinecdmadapter',
       'type': 'none',
@@ -60,6 +91,10 @@
             '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter',
             'widevine_cdm_version_h',
             'widevine_cdm_binaries',
+            'widevinecdmadapter_resources',
+          ],
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/widevinecdmadapter_version.rc',
           ],
           'conditions': [
             [ 'os_posix == 1 and OS != "mac"', {
diff --git a/chromium/third_party/widevine/cdm/widevinecdmadapter.ver b/chromium/third_party/widevine/cdm/widevinecdmadapter.ver
new file mode 100644
index 00000000000..c08977201f7
--- /dev/null
+++ b/chromium/third_party/widevine/cdm/widevinecdmadapter.ver
@@ -0,0 +1,2 @@
+INTERNAL_NAME=widevinecdmadapter_dll
+ORIGINAL_FILENAME=widevinecdmadapter.dll