Move webkit/plugins/ppapi to content/renderer/pepper.

content/common/pepper_plugin_registry.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/pepper_plugin_registry.h"
 
 #include "base/command_line.h"
 #include "base/native_library.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 166 matching lines @@
 
   // Modules aren't destroyed very often and there are normally at most a
   // couple of them. So for now we just do a brute-force search.
   for (NonOwningModuleMap::iterator i = live_modules_.begin();
        i != live_modules_.end(); ++i) {
     if (i->second == dead_module) {
       live_modules_.erase(i);
       return;
     }
   }
-  NOTREACHED();  // Should have always found the module above.
+  // Can occur in tests.
 }
 
 PepperPluginRegistry::~PepperPluginRegistry() {
   // Explicitly clear all preloaded modules first. This will cause callbacks
   // to erase these modules from the live_modules_ list, and we don't want
   // that to happen implicitly out-of-order.
   preloaded_modules_.clear();
 
   DCHECK(live_modules_.empty());
 }
 
 PepperPluginRegistry::PepperPluginRegistry() {
   ComputeList(&plugin_list_);
 
   // Note that in each case, AddLiveModule must be called before completing
   // initialization. If we bail out (in the continue clauses) before saving
   // the initialized module, it will still try to unregister itself in its
   // destructor.
   for (size_t i = 0; i < plugin_list_.size(); i++) {
     const PepperPluginInfo& current = plugin_list_[i];
     if (current.is_out_of_process)
       continue;  // Out of process plugins need no special pre-initialization.
 
     scoped_refptr<webkit::ppapi::PluginModule> module =
-        new webkit::ppapi::PluginModule(current.name, current.path, this,
+        new webkit::ppapi::PluginModule(current.name, current.path,
             ppapi::PpapiPermissions(current.permissions));
     AddLiveModule(current.path, module.get());
     if (current.is_internal) {
       if (!module->InitAsInternalPlugin(current.internal_entry_points)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
         continue;
       }
     } else {
       // Preload all external plugins we're not running out of process.
       if (!module->InitAsLibrary(current.path)) {
         DLOG(ERROR) << "Failed to load pepper module: " << current.path.value();
         continue;
       }
     }
     preloaded_modules_[current.path] = module;
   }
 }
 
 }  // namespace content