Load Pepper v2 internal pdf plugin.

Review URL: http://codereview.chromium.org/2891016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52575 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 14 deletions

diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc
index a79513d..877548e 100644
--- a/webkit/glue/plugins/plugin_lib.cc
+++ b/webkit/glue/plugins/plugin_lib.cc
@@ -71,8 +71,7 @@ PluginLib::PluginLib(const WebPluginInfo& info,
       initialized_(false),
       saved_data_(0),
       instance_count_(0),
-      skip_unload_(false),
-      always_loaded_(false) {
+      skip_unload_(false) {
   StatsCounter(kPluginLibrariesLoadedCounter).Increment();
   memset(static_cast<void*>(&plugin_funcs_), 0, sizeof(plugin_funcs_));
   g_loaded_libs->push_back(this);
@@ -139,11 +138,6 @@ void PluginLib::PreventLibraryUnload() {
   skip_unload_ = true;
 }
 
-bool PluginLib::EnsureAlwaysLoaded() {
-  always_loaded_ = true;
-  return Load();
-}
-
 PluginInstance* PluginLib::CreateInstance(const std::string& mime_type) {
   PluginInstance* new_instance = new PluginInstance(this, mime_type);
   instance_count_++;
@@ -264,9 +258,6 @@ class FreePluginLibraryTask : public Task {
 };
 
 void PluginLib::Unload() {
-  if (always_loaded_)
-    return;
-
   if (!internal_ && library_) {
     // In case of single process mode, a plugin can delete itself
     // by executing a script. So delay the unloading of the library
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h
index 32d8a14..647916e 100644
--- a/webkit/glue/plugins/plugin_lib.h
+++ b/webkit/glue/plugins/plugin_lib.h
@@ -78,9 +78,6 @@ class PluginLib : public base::RefCounted<PluginLib> {
   // some plugins crash if unloaded).
   void PreventLibraryUnload();
 
-  // Loads the library now and ensures it's never unloaded.
-  bool EnsureAlwaysLoaded();
-
   // protected for testability.
  protected:
   friend class base::RefCounted<PluginLib>;
@@ -111,7 +108,6 @@ class PluginLib : public base::RefCounted<PluginLib> {
   NPSavedData *saved_data_;  // Persisted plugin info for NPAPI.
   int instance_count_;  // Count of plugins in use.
   bool skip_unload_;  // True if library_ should not be unloaded.
-  bool always_loaded_;  // True if should always keep this loaded.
 
   // Function pointers to entry points into the plugin.
   PluginEntryPoints entry_points_;