Update Chromium to beta version 37.0.2062.68

Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

6 files changed, 21 insertions, 44 deletions

diff --git a/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json
index edb7559c809..2829fecb424 100644
--- a/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json
+++ b/chromium/chrome/common/extensions/docs/examples/api/fontSettings/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Advanced Font Settings",
-  "version": "0.66",
+  "version": "0.67",
   "manifest_version": 2,
   "description": "Customize per-script font settings.",
   "options_page": "options.html",
diff --git a/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json
index f14c8ad5006..0ebfe5cef4a 100644
--- a/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json
+++ b/chromium/chrome/common/extensions/docs/examples/api/infobars/sandwichbar/manifest.json
@@ -13,7 +13,10 @@
   },
   "content_scripts" : [
     {
-      "matches" : [ "http://*/*" ],
+      "matches" : [ 
+         "http://*/*",
+         "https://*/*"
+      ],
       "js" : [ "contentscript.js" ],
       "run_at" : "document_idle",
       "all_frames" : false
diff --git a/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json
index 2b09d279021..79134a72efa 100644
--- a/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json
+++ b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_content/manifest.json
@@ -1,29 +1,20 @@
 {
   "name" : "Page action by content",
   "version" : "1.1",
-  "description" : "Shows a page action for HTML pages containing the word 'sandwich'",
+  "description" : "Shows a page action for HTML pages containing a video",
   "background" : {
-    "scripts": ["background.js"]
+    "scripts": ["background.js"],
+    "persistent": false
   },
   "page_action" :
   {
-    "default_icon" : "sandwich-19.png",
-    "default_title" : "There's a 'sandwich' in this page!"
+    "default_icon" : "video-19.png",
+    "default_title" : "There's a <video> in this page!"
   },
-  "content_scripts" : [
-    {
-      "matches" : [
-        "http://*/*",
-        "https://*/*"
-      ],
-      "js" : ["contentscript.js"],
-      "run_at" : "document_idle",
-      "all_frames" : false
-    }
-  ],
+  "permissions": [ "declarativeContent" ],
   "icons" : {
-    "48" : "sandwich-48.png",
-    "128" : "sandwich-128.png"
+    "48" : "video-48.png",
+    "128" : "video-128.png"
   },
   "manifest_version": 2
-}
\ No newline at end of file
+}
diff --git a/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json
index 631ed9e0795..5c20902fd4e 100644
--- a/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json
+++ b/chromium/chrome/common/extensions/docs/examples/api/pageAction/pageaction_by_url/manifest.json
@@ -2,14 +2,17 @@
   "name": "Page action by URL",
   "version": "1.0",
   "description": "Shows a page action for urls which have the letter 'g' in them.",
-  "background": { "scripts": ["background.js"] },
+  "background": {
+    "scripts": ["background.js"],
+    "persistent": false
+  },
   "page_action" :
   {
     "default_icon" : "icon-19.png",
     "default_title" : "There's a 'G' in this URL!"
   },
   "permissions" : [
-    "tabs"
+    "declarativeContent"
   ],
   "icons" : {
     "48" : "icon-48.png",
diff --git a/chromium/chrome/common/extensions/docs/examples/apps/calculator/app/manifest.json b/chromium/chrome/common/extensions/docs/examples/apps/calculator/app/manifest.json
index 76c570d8c7c..09b249e0d8c 100644
--- a/chromium/chrome/common/extensions/docs/examples/apps/calculator/app/manifest.json
+++ b/chromium/chrome/common/extensions/docs/examples/apps/calculator/app/manifest.json
@@ -3,11 +3,10 @@
   "description": "A simple calculator.",
   "manifest_version": 2,
   "minimum_chrome_version": "23",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "app": {"background": {"scripts": ["model.js", "view.js", "controller.js"]}},
   "icons": {
     "16": "images/icon-16x16.png",
     "128": "images/icon-128x128.png"
-  },
-  "permissions": ["storage"]
+  }
 }
diff --git a/chromium/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json b/chromium/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json
deleted file mode 100644
index bff719b3a22..00000000000
--- a/chromium/chrome/common/extensions/docs/examples/extensions/benchmark/manifest.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "Page Benchmarker",
-  "version": "1.3.4.0",
-  "manifest_version": 2,
-  "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
-  "description": "Chromium Page Benchmarker.",
-  "background": {
-    "page": "background.html",
-    "persistent": false
-  },
-  "browser_action": {
-    "default_title": "Benchmark page load time",
-    "default_icon": "stopwatch.jpg"
-  },
-  "options_page": "options.html",
-  "permissions": [
-    "tabs", "https://*/*", "http://*/*"
-  ]
-}