Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

Index: chrome/browser/chromeos/gview_request_interceptor_unittest.cc
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
index eb145341a0f1f519690e9e6d0ab0599a052a1b57..9c5aed1cff5ba8c1b8fae7ec94d6aae7c109ca23 100644
--- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
+++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc
@@ -25,7 +25,6 @@
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 using content::BrowserThread;
 
@@ -116,7 +115,7 @@ class GViewRequestInterceptorTest : public testing::Test {
 
     handler_ = new content::DummyResourceHandler();
 
-    PluginService::GetInstance()->RefreshPluginList();
+    PluginService::GetInstance()->RefreshPlugins();
     PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop));
     MessageLoop::current()->RunAllPending();
   }
@@ -140,17 +139,17 @@ class GViewRequestInterceptorTest : public testing::Test {
   void RegisterPDFPlugin() {
     webkit::WebPluginInfo info;
     info.path = pdf_path_;
-    webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
+    PluginService::GetInstance()->RegisterInternalPlugin(info);
 
-    PluginService::GetInstance()->RefreshPluginList();
+    PluginService::GetInstance()->RefreshPlugins();
     PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop));
     MessageLoop::current()->RunAllPending();
   }
 
   void UnregisterPDFPlugin() {
-    webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(pdf_path_);
+    PluginService::GetInstance()->UnregisterInternalPlugin(pdf_path_);
 
-    PluginService::GetInstance()->RefreshPluginList();
+    PluginService::GetInstance()->RefreshPlugins();
     PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop));
     MessageLoop::current()->RunAllPending();
   }