Moved JsonPrefStore to use SequencedWorkerPool

chrome/browser/extensions/menu_manager_unittest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.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"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using testing::_;
 using testing::AtLeast;
 using testing::DeleteArg;
 using testing::InSequence;
 using testing::Return;
 using testing::SaveArg;
 
 namespace extensions {
 
 // Base class for tests.
 class MenuManagerTest : public testing::Test {
  public:
   MenuManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_),
                       file_thread_(BrowserThread::FILE, &message_loop_),
                       manager_(&profile_),
                       next_id_(1) {
+    prefs_.reset(new TestExtensionPrefs(message_loop_.message_loop_proxy()));
+  }
+
+  ~MenuManagerTest() {

[akalin, 2012/10/19 02:00:51]

destructor should be virtual

[zel, 2012/10/19 18:45:07]

Removed.

+  }
+
+  virtual void TearDown() OVERRIDE {
+    prefs_->pref_service()->CommitPendingWrite();
+    MessageLoop::current()->RunAllPending();
   }
 
   // Returns a test item.
   MenuItem* CreateTestItem(Extension* extension) {
     MenuItem::Type type = MenuItem::NORMAL;
     MenuItem::ContextList contexts(MenuItem::ALL);
     MenuItem::Id id(false, extension->id());
     id.uid = next_id_++;
     return new MenuItem(id, "test", false, true, type, contexts);
   }
 
   // Returns a test item with the given string ID.
   MenuItem* CreateTestItemWithID(Extension* extension,
                                  const std::string& string_id) {
     MenuItem::Type type = MenuItem::NORMAL;
     MenuItem::ContextList contexts(MenuItem::ALL);
     MenuItem::Id id(false, extension->id());
     id.string_uid = string_id;
     return new MenuItem(id, "test", false, true, type, contexts);
   }
 
   // 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;
   }
 
  protected:
   TestingProfile profile_;
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 
   MenuManager manager_;
   ExtensionList extensions_;
-  TestExtensionPrefs prefs_;
+  scoped_ptr<TestExtensionPrefs> prefs_;

[akalin, 2012/10/19 02:00:51]

as above, don't think this needs to be a scoped_ptr anymore

[zel, 2012/10/19 18:45:07]

Done.

   int next_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MenuManagerTest);
 };
 
 // Tests adding, getting, and removing items.
 TEST_F(MenuManagerTest, AddGetRemoveItems) {
   Extension* extension = AddExtension("test");
 
@@ skipping 591 matching lines @@
   ASSERT_TRUE(child1->checked());
 
   // Removing |parent| should cause only |child1| to be selected.
   manager_.RemoveContextMenuItem(parent->id());
   parent = NULL;
   ASSERT_FALSE(new_item->checked());
   ASSERT_TRUE(child1->checked());
 }
 
 }  // namespace extensions