Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(948)

Unified Diff: webkit/tools/test_shell/test_shell.cc

Issue 8602002: Move some webkit_glue embedder functions into WebKitPlatformSupport virtual methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright year Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/simple_socket_stream_bridge.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f6d3e5b31bb43359190ebe18a5b724659af4c279..f649dfd142a8c305c290d257c629e60a2781f8e2 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -47,8 +47,6 @@
#include "webkit/glue/user_agent.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webpreferences.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/webplugininfo.h"
#include "webkit/tools/test_shell/notification_presenter.h"
#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
#include "webkit/tools/test_shell/test_navigation_controller.h"
@@ -626,29 +624,3 @@ WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
}
return geolocation_client_mock_.get();
}
-
-namespace webkit_glue {
-
-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
« no previous file with comments | « webkit/tools/test_shell/simple_socket_stream_bridge.cc ('k') | webkit/tools/test_shell/test_shell_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698