summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 21:49:54 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-15 21:49:54 +0000
commitae4e20ac9d99988fb5b522acfaae08cb469a2ab7 (patch)
treeede89baf7be0f91f2fc9c1734a6060ce75fe648f /chrome
parent022f42453b737577e9175eb279d507981ef40b30 (diff)
downloadchromium_src-ae4e20ac9d99988fb5b522acfaae08cb469a2ab7.zip
chromium_src-ae4e20ac9d99988fb5b522acfaae08cb469a2ab7.tar.gz
chromium_src-ae4e20ac9d99988fb5b522acfaae08cb469a2ab7.tar.bz2
New implementations of core plugin libraries.
Review URL: http://codereview.chromium.org/17427 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/plugin/plugin_thread.cc2
-rw-r--r--chrome/test/plugin/plugin_test.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 8b8c20e..d08d5e7 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -76,7 +76,7 @@ void PluginThread::Init() {
resource_dispatcher_ = new ResourceDispatcher(this);
// Preload the library to avoid loading, unloading then reloading
- preloaded_plugin_module_ = NPAPI::PluginLib::LoadPluginHelper(
+ preloaded_plugin_module_ = NPAPI::PluginLib::LoadNativeLibrary(
plugin_process_->plugin_path());
ChromePluginLib::Create(plugin_process_->plugin_path(),
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index d0d0393..d458662 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -54,6 +54,7 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
#include "net/base/net_util.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
#include "webkit/glue/plugins/plugin_list.h"
const char kTestCompleteCookie[] = "status";