Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.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/extension_system_factory.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/pref_service_syncable.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"
@@ skipping 12 matching lines @@
 class MenuManagerTest : public testing::Test {
  public:
   MenuManagerTest() : ui_thread_(BrowserThread::UI, &message_loop_),
                       file_thread_(BrowserThread::FILE, &message_loop_),
                       manager_(&profile_),
                       prefs_(message_loop_.message_loop_proxy()),
                       next_id_(1) {
   }
 
   virtual void TearDown() OVERRIDE {
     prefs_.pref_service()->CommitPendingWrite();

[Mattias Nissler (ping if slow), 2013/02/06 17:53:33]

pref_service() should return a PrefService instead of a PrefServiceSyncable
here.

[Jói, 2013/02/07 14:52:32]

Done.

     message_loop_.RunUntilIdle();
   }
 
   // Returns a test item.
   MenuItem* CreateTestItem(Extension* extension, bool incognito = false) {
     MenuItem::Type type = MenuItem::NORMAL;
     MenuItem::ContextList contexts(MenuItem::ALL);
     MenuItem::Id id(incognito, extension->id());
     id.uid = next_id_++;
     return new MenuItem(id, "test", false, true, type, contexts);
@@ skipping 682 matching lines @@
   EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size());
   EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
 
   // Remove all context menu items with incognito true.
   manager_.RemoveAllIncognitoContextItems();
   EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
   EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
 }
 
 }  // namespace extensions