diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:50:26 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:50:26 +0000 |
| commit | 183d4b83abbb1a3f0128a03a6450695626d043a3 (patch) | |
| tree | 00b0104642cf5c39e8398d42dee55b0c2c5c9fb2 /chrome/browser/chromeos | |
| parent | bc29eb72f36c87c85388aa9d1cc978552be1d2cc (diff) | |
| download | chromium_src-183d4b83abbb1a3f0128a03a6450695626d043a3.zip chromium_src-183d4b83abbb1a3f0128a03a6450695626d043a3.tar.gz chromium_src-183d4b83abbb1a3f0128a03a6450695626d043a3.tar.bz2 | |
Move PluginPrefs to use PluginService instead of PluginList.
BUG=103788,chromium-os:22447
TEST=unit_tests --gtest_filter=PluginPrefs*
Review URL: http://codereview.chromium.org/8515021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/gview_request_interceptor_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc index 9c5aed1..ea119a9 100644 --- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc +++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc @@ -5,6 +5,7 @@ #include <string> #include <vector> +#include "base/at_exit.h" #include "base/bind.h" #include "base/message_loop.h" #include "chrome/browser/chrome_plugin_service_filter.h" @@ -115,6 +116,7 @@ class GViewRequestInterceptorTest : public testing::Test { handler_ = new content::DummyResourceHandler(); + PluginService::GetInstance()->Init(); PluginService::GetInstance()->RefreshPlugins(); PluginService::GetInstance()->GetPlugins(base::Bind(&QuitMessageLoop)); MessageLoop::current()->RunAllPending(); @@ -200,6 +202,7 @@ class GViewRequestInterceptorTest : public testing::Test { } protected: + base::ShadowingAtExitManager at_exit_manager_; // Deletes PluginService. MessageLoopForIO message_loop_; content::TestBrowserThread ui_thread_; content::TestBrowserThread file_thread_; |