Moved JsonPrefStore to use SequencedWorkerPool

chrome/browser/extensions/menu_manager_unittest.cc

Index: chrome/browser/extensions/menu_manager_unittest.cc
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index fc6049da9564bd4745f44664bde84d9d1f01b964..2e66e1fd22ed01316a13e79c6c8ec56aa6a73672 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -9,11 +9,13 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
+#include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/menu_manager.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
@@ -43,6 +45,18 @@ class MenuManagerTest : public testing::Test {
                       file_thread_(BrowserThread::FILE, &message_loop_),
                       manager_(&profile_),
                       next_id_(1) {
+    blocking_pool_ = new base::SequencedWorkerPool(1, "ExtensionTestBlocking");

[akalin, 2012/10/18 23:52:24]

use current loop, etc.

+    prefs_.reset(new TestExtensionPrefs(blocking_pool_));
+  }
+
+  ~MenuManagerTest() {
+    blocking_pool_->Shutdown();
+  }
+
+  virtual void TearDown() OVERRIDE {
+    prefs_->pref_service()->CommitPendingWrite();
+    blocking_pool_->FlushForTesting();
+    MessageLoop::current()->RunAllPending();
   }
 
   // Returns a test item.
@@ -67,7 +81,7 @@ class MenuManagerTest : public testing::Test {
   // Creates and returns a test Extension. The caller does *not* own the return
   // value.
   Extension* AddExtension(std::string name) {
-    scoped_refptr<Extension> extension = prefs_.AddExtension(name);
+    scoped_refptr<Extension> extension = prefs_->AddExtension(name);
     extensions_.push_back(extension);
     return extension;
   }
@@ -80,7 +94,9 @@ class MenuManagerTest : public testing::Test {
 
   MenuManager manager_;
   ExtensionList extensions_;
-  TestExtensionPrefs prefs_;
+  scoped_ptr<TestExtensionPrefs> prefs_;
+  // A blocking pool that we can use for file operations.
+  scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
   int next_id_;
 
  private: