Revert r108760 / reland r108744, r108753 w/ fix

content/test/test_content_client.cc

Index: content/test/test_content_client.cc
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index 7f329f1b9b0e36d1cec781344f007314cb244f0a..e1d6d438ad3686752941d098f2d09fb3c8511d70 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -23,6 +23,10 @@ void TestContentClient::AddPepperPlugins(
     std::vector<content::PepperPluginInfo>* plugins) {
 }
 
+void TestContentClient::AddNPAPIPlugins(
+    webkit::npapi::PluginList* plugin_list) {
+}
+
 bool TestContentClient::CanSendWhileSwappedOut(const IPC::Message* msg) {
   return true;
 }