diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 07:24:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 07:24:23 +0000 |
| commit | 4aad80b60cf51316d5d102465c7baa1e48c3dfd1 (patch) | |
| tree | ca2d38a7583f230a253062a0cc4014fb72fab669 | |
| parent | 695c82f3f235e72fe29bfd230b820c3b4953cd8a (diff) | |
| download | chromium_src-4aad80b60cf51316d5d102465c7baa1e48c3dfd1.zip chromium_src-4aad80b60cf51316d5d102465c7baa1e48c3dfd1.tar.gz chromium_src-4aad80b60cf51316d5d102465c7baa1e48c3dfd1.tar.bz2 | |
Disable PluginListTests that depend on NPAPI on android
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212269 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/npapi/plugin_list_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/plugin_list_unittest.cc b/webkit/plugins/npapi/plugin_list_unittest.cc index 432b90f..135be62 100644 --- a/webkit/plugins/npapi/plugin_list_unittest.cc +++ b/webkit/plugins/npapi/plugin_list_unittest.cc @@ -32,8 +32,8 @@ bool Contains(const std::vector<WebPluginInfo>& list, } // namespace -// Linux Aura doesn't support NPAPI. -#if !(defined(OS_LINUX) && defined(USE_AURA)) +// Linux Aura and Android don't support NPAPI. +#if defined(OS_WIN) || defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(USE_AURA)) base::FilePath::CharType kFooPath[] = FILE_PATH_LITERAL("/plugins/foo.plugin"); base::FilePath::CharType kBarPath[] = FILE_PATH_LITERAL("/plugins/bar.plugin"); |