Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/chromeos/gview_request_interceptor_unittest.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/chromeos/gview_request_interceptor.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/plugin_prefs_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/browser/mock_resource_context.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/dummy_resource_handler.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/test/test_browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
 #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;
 
 namespace chromeos {
 
 namespace {
 
 const char kPdfUrl[] = "http://foo.com/file.pdf";
 const char kPptUrl[] = "http://foo.com/file.ppt";
 const char kHtmlUrl[] = "http://foo.com/index.html";
@@ skipping 70 matching lines @@
     plugin_prefs_->SetPrefs(&prefs_);
     ChromePluginServiceFilter* filter =
         ChromePluginServiceFilter::GetInstance();
     filter->RegisterResourceContext(plugin_prefs_, resource_context);
     PluginService::GetInstance()->set_filter(filter);
 
     ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path_));
 
     handler_ = new content::DummyResourceHandler();
 
-    PluginService::GetInstance()->RefreshPluginList();
+    PluginService::GetInstance()->RefreshPlugins();
     PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop));
     MessageLoop::current()->RunAllPending();
   }
 
   virtual void TearDown() {
     plugin_prefs_->ShutdownOnUIThread();
     content::ResourceContext* resource_context =
         content::MockResourceContext::GetInstance();
     net::URLRequestContext* request_context =
         resource_context->request_context();
     request_context->set_job_factory(old_factory_);
     ChromePluginServiceFilter* filter =
         ChromePluginServiceFilter::GetInstance();
     filter->UnregisterResourceContext(resource_context);
     PluginService::GetInstance()->set_filter(NULL);
   }
 
   // GetPluginInfoByPath() will only use stale information. Because plugin
   // refresh is asynchronous, spin a MessageLoop until the callback is run,
   // after which, the test will continue.
   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();
   }
 
   void SetPDFPluginLoadedState(bool want_loaded) {
     webkit::WebPluginInfo info;
     bool is_loaded = PluginService::GetInstance()->GetPluginInfoByPath(
         pdf_path_, &info);
     if (is_loaded && !want_loaded) {
       UnregisterPDFPlugin();
@@ skipping 132 matching lines @@
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL(kPdfBlob), request.url());
 }
 
 }  // namespace
 
 }  // namespace chromeos