| Index: webkit/tools/test_shell/test_shell.cc
|
| diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
|
| index f5142542f0ede7e45e55af447318fa40ac978ef0..f59d17eb3abaa82f12dbb4c07f6504532aa4b962 100644
|
| --- a/webkit/tools/test_shell/test_shell.cc
|
| +++ b/webkit/tools/test_shell/test_shell.cc
|
| @@ -624,3 +624,41 @@ WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
|
| }
|
| return geolocation_client_mock_.get();
|
| }
|
| +
|
| +//-----------------------------------------------------------------------------
|
| +
|
| +namespace webkit_glue {
|
| +
|
| +bool IsProtocolSupportedForMedia(const GURL& url) {
|
| + if (url.SchemeIsFile() ||
|
| + url.SchemeIs("http") ||
|
| + url.SchemeIs("https") ||
|
| + url.SchemeIs("data") ||
|
| + url.SchemeIsFileSystem())
|
| + return true;
|
| + return false;
|
| +}
|
| +
|
| +void GetPlugins(bool refresh,
|
| + std::vector<webkit::WebPluginInfo>* plugins) {
|
| + if (refresh)
|
| + webkit::npapi::PluginList::Singleton()->RefreshPlugins();
|
| + webkit::npapi::PluginList::Singleton()->GetPlugins(plugins);
|
| + // Don't load the forked TestNetscapePlugIn in the chromium code, use
|
| + // the copy in webkit.org's repository instead.
|
| + const FilePath::StringType kPluginBlackList[] = {
|
| + FILE_PATH_LITERAL("npapi_layout_test_plugin.dll"),
|
| + FILE_PATH_LITERAL("WebKitTestNetscapePlugIn.plugin"),
|
| + FILE_PATH_LITERAL("libnpapi_layout_test_plugin.so"),
|
| + };
|
| + for (int i = plugins->size() - 1; i >= 0; --i) {
|
| + webkit::WebPluginInfo plugin_info = plugins->at(i);
|
| + for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
|
| + if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
|
| + plugins->erase(plugins->begin() + i);
|
| + }
|
| + }
|
| + }
|
| +}
|
| +
|
| +} // namespace webkit_glue
|
|
|