Reland r101269: Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo.

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 "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"
@@ skipping 53 matching lines @@
 
   virtual net::URLRequestJob* MaybeCreateJob(net::URLRequest* request) const {
     return new GViewURLRequestTestJob(request);
   }
 };
 
 class GViewRequestInterceptorTest : public testing::Test {
  public:
   GViewRequestInterceptorTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
+        file_thread_(BrowserThread::FILE, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {}
 
   virtual void SetUp() {
     content::ResourceContext* resource_context =
         content::MockResourceContext::GetInstance();
     net::URLRequestContext* request_context =
         resource_context->request_context();
     old_factory_ = request_context->job_factory();
     job_factory_.SetProtocolHandler("http", new GViewRequestProtocolFactory);
     job_factory_.AddInterceptor(new GViewRequestInterceptor);
     request_context->set_job_factory(&job_factory_);
     PluginPrefs::RegisterPrefs(&prefs_);
     plugin_prefs_ = new PluginPrefs();
     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();
   }
 
   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);
   }
 
   void RegisterPDFPlugin() {
     webkit::WebPluginInfo info;
     info.path = pdf_path_;
-    info.enabled = webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
   void UnregisterPDFPlugin() {
     webkit::npapi::PluginList::Singleton()->UnregisterInternalPlugin(pdf_path_);
     webkit::npapi::PluginList::Singleton()->RefreshPlugins();
   }
 
   void SetPDFPluginLoadedState(bool want_loaded) {
@@ skipping 35 matching lines @@
                                               true,        // allow_download
                                               false,       // has_user_gesture
                                               context);
     request->SetUserData(NULL, info);
     request->set_context(context->request_context());
   }
 
  protected:
   MessageLoopForIO message_loop_;
   BrowserThread ui_thread_;
+  BrowserThread file_thread_;
   BrowserThread io_thread_;
   TestingPrefService prefs_;
   scoped_refptr<PluginPrefs> plugin_prefs_;
   net::URLRequestJobFactory job_factory_;
   const net::URLRequestJobFactory* old_factory_;
   scoped_refptr<ResourceHandler> handler_;
   TestDelegate test_delegate_;
   FilePath pdf_path_;
 };
 
@@ skipping 11 matching lines @@
   SetupRequest(&request);
   request.set_load_flags(net::LOAD_IS_DOWNLOAD);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://foo.com/file.pdf"), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, DoNotInterceptPdfWhenEnabled) {
   SetPDFPluginLoadedState(true);
-  webkit::npapi::PluginList::Singleton()->EnablePlugin(pdf_path_);
+  plugin_prefs_->EnablePlugin(true, pdf_path_);
 
   net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(0, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://foo.com/file.pdf"), request.url());
 }
 
 TEST_F(GViewRequestInterceptorTest, InterceptPdfWhenDisabled) {
   SetPDFPluginLoadedState(true);
-  webkit::npapi::PluginList::Singleton()->DisablePlugin(pdf_path_);
+  plugin_prefs_->EnablePlugin(false, pdf_path_);
 
   net::URLRequest request(GURL("http://foo.com/file.pdf"), &test_delegate_);
   SetupRequest(&request);
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(
       GURL("http://docs.google.com/gview?url=http%3A//foo.com/file.pdf"),
       request.url());
 }
@@ skipping 16 matching lines @@
   request.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(1, test_delegate_.received_redirect_count());
   EXPECT_EQ(GURL("http://docs.google.com/gview?url=http%3A//foo.com/file.ppt"),
                  request.url());
 }
 
 }  // namespace
 
 }  // namespace chromeos