diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 10:39:44 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 10:39:44 +0000 |
| commit | a41179ce3bf8c711e18e1fae6877f7d71400deb8 (patch) | |
| tree | ab99ebfec76fe5fb3f12b6e839fd2759333702c7 /chrome/test | |
| parent | 31494b8ff9aaaaf317ad9f0f5da4623af328bc3e (diff) | |
| download | chromium_src-a41179ce3bf8c711e18e1fae6877f7d71400deb8.zip chromium_src-a41179ce3bf8c711e18e1fae6877f7d71400deb8.tar.gz chromium_src-a41179ce3bf8c711e18e1fae6877f7d71400deb8.tar.bz2 | |
Revert 185189.
This caused the NativeMessageBasic to timeout on cros and precise bots.
Example output:
ExtensionApiTest.NativeMessageBasic:
[27122:27146:0228/021309:2707841027:ERROR:nss_util.cc(492)] Error initializing NSS with a persistent database (sql:/etc/fake_root_ca/nssdb): NSS error code: -8174
Xlib: extension "GLX" missing on display ":9.0".
[27122:27122:0228/021309:2707849603:ERROR:gl_surface_glx.cc(326)] glxQueryVersion failed
[27122:27122:0228/021309:2707849652:ERROR:gl_surface_linux.cc(58)] GLSurfaceGLX::InitializeOneOff failed.
[27122:27122:0228/021309:2707849685:ERROR:compositor.cc(140)] Could not load the GL bindings
Xlib: extension "RANDR" missing on display ":9.0".
Xlib: extension "GLX" missing on display ":9.0".
[27153:27153:0228/021310:ERROR:gl_surface_glx.cc(326)] glxQueryVersion failed
[27153:27153:0228/021310:ERROR:gl_surface_linux.cc(58)] GLSurfaceGLX::InitializeOneOff failed.
[27153:27153:0228/021310:ERROR:nss_util.cc(492)] Error initializing NSS with a persistent database (sql:/etc/fake_root_ca/nssdb): NSS error code: -8174
Xlib: extension "GLX" missing on display ":9.0".
[27171:27171:0228/021310:ERROR:gl_surface_glx.cc(326)] glxQueryVersion failed
[27171:27171:0228/021310:ERROR:gl_surface_linux.cc(58)] GLSurfaceGLX::InitializeOneOff failed.
[27171:27171:0228/021310:ERROR:nss_util.cc(492)] Error initializing NSS with a persistent database (sql:/etc/fake_root_ca/nssdb): NSS error code: -8174
[27122:27155:0228/021310:2708725028:ERROR:native_process_launcher.cc(94)] Could not find native host: com.google.chrome.test.echo
[27122:27155:0228/021310:2708736310:ERROR:native_process_launcher.cc(94)] Could not find native host: com.google.chrome.test.echo
[27122:27155:0228/021310:2708739432:ERROR:native_process_launcher.cc(94)] Could not find native host: com.google.chrome.test.echo
Killed (timed out).
> 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
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/12386018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/data/extensions/api_test/native_messaging/manifest.json | 2 | ||||
| -rw-r--r-- | chrome/test/data/extensions/api_test/native_messaging/test.js | 2 |
2 files changed, 1 insertions, 3 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 487e572..3b3d173 100644 --- a/chrome/test/data/extensions/api_test/native_messaging/manifest.json +++ b/chrome/test/data/extensions/api_test/native_messaging/manifest.json @@ -1,6 +1,4 @@ { - // 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 2715a42..1ea0a3b 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 = 'com.google.chrome.test.echo'; +var appName = navigator.platform.match(/win/i) ? 'echo.bat' : 'echo.py'; chrome.test.getConfig(function(config) { chrome.test.runTests([ |