summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 09:18:59 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-28 09:18:59 +0000
commit5b72ad1ebb4d792a322edd81d785c312b349fc33 (patch)
tree3c0ef430fb22264316b73c0ef0966c8f5b57630d /chrome/test
parent1ec0736284a1cc8c44610900f704b3e681c544b3 (diff)
downloadchromium_src-5b72ad1ebb4d792a322edd81d785c312b349fc33.zip
chromium_src-5b72ad1ebb4d792a322edd81d785c312b349fc33.tar.gz
chromium_src-5b72ad1ebb4d792a322edd81d785c312b349fc33.tar.bz2
Require manifests for native messaging hosts.
Previously native messaging hosts were discovered by looking in the user data directory. That approach is hard to use and is not reliable. Now chrome will look for a host manifest file in a system-specific directory and load that file to find host binary. BUG=142915 TBR=thakis@chromium.org Review URL: https://chromiumcodereview.appspot.com/12285015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/native_messaging/manifest.json2
-rw-r--r--chrome/test/data/extensions/api_test/native_messaging/test.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/data/extensions/api_test/native_messaging/manifest.json b/chrome/test/data/extensions/api_test/native_messaging/manifest.json
index 3b3d173..487e572 100644
--- a/chrome/test/data/extensions/api_test/native_messaging/manifest.json
+++ b/chrome/test/data/extensions/api_test/native_messaging/manifest.json
@@ -1,4 +1,6 @@
{
+ // Extension ID: knldjmfmopnpolahpmmgbagdohdnhkik
+ "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcBHwzDvyBQ6bDppkIs9MP4ksKqCMyXQ/A52JivHZKh4YO/9vJsT3oaYhSpDCE9RPocOEQvwsHsFReW2nUEc6OLLyoCFFxIb7KkLGsmfakkut/fFdNJYh0xOTbSN8YvLWcqph09XAY2Y/f0AL7vfO1cuCqtkMt8hFrBGWxDdf9CQIDAQAB",
"version": "1.0.0.0",
"manifest_version": 2,
"name": "native messaging test",
diff --git a/chrome/test/data/extensions/api_test/native_messaging/test.js b/chrome/test/data/extensions/api_test/native_messaging/test.js
index 1ea0a3b..2715a42 100644
--- a/chrome/test/data/extensions/api_test/native_messaging/test.js
+++ b/chrome/test/data/extensions/api_test/native_messaging/test.js
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-var appName = navigator.platform.match(/win/i) ? 'echo.bat' : 'echo.py';
+var appName = 'com.google.chrome.test.echo';
chrome.test.getConfig(function(config) {
chrome.test.runTests([