Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1377)

Unified Diff: content/browser/plugin_loader_posix_unittest.cc

Issue 8515021: Move PluginPrefs to use PluginService instead of PluginList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update tests Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/plugin_prefs_unittest.cc ('k') | content/browser/plugin_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_loader_posix_unittest.cc
diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc
index 5111f58b7f820d3fb072f84dc78e637d599cbb7d..b9cbfacd11c6fb16bb0324593598324107c3d6c6 100644
--- a/content/browser/plugin_loader_posix_unittest.cc
+++ b/content/browser/plugin_loader_posix_unittest.cc
@@ -4,6 +4,7 @@
#include "content/browser/plugin_loader_posix.h"
+#include "base/at_exit.h"
#include "base/bind.h"
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
@@ -72,6 +73,10 @@ class PluginLoaderPosixTest : public testing::Test {
plugin_loader_(new MockPluginLoaderPosix) {
}
+ virtual void SetUp() OVERRIDE {
+ PluginService::GetInstance()->Init();
+ }
+
MessageLoop* message_loop() { return &message_loop_; }
MockPluginLoaderPosix* plugin_loader() { return plugin_loader_.get(); }
@@ -88,6 +93,8 @@ class PluginLoaderPosixTest : public testing::Test {
webkit::WebPluginInfo plugin3_;
private:
+ base::ShadowingAtExitManager at_exit_manager_; // Destroys PluginService.
+
MessageLoopForIO message_loop_;
BrowserThreadImpl file_thread_;
BrowserThreadImpl io_thread_;
« no previous file with comments | « chrome/browser/plugin_prefs_unittest.cc ('k') | content/browser/plugin_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698