OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/extensions/menu_manager.h" | 5 #include "chrome/browser/extensions/menu_manager.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
11 #include "base/json/json_reader.h" | 11 #include "base/json/json_reader.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 #include "base/run_loop.h" |
14 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
15 #include "base/values.h" | 16 #include "base/values.h" |
16 #include "chrome/browser/chrome_notification_types.h" | 17 #include "chrome/browser/chrome_notification_types.h" |
17 #include "chrome/browser/extensions/extension_system_factory.h" | 18 #include "chrome/browser/extensions/extension_system_factory.h" |
18 #include "chrome/browser/extensions/test_extension_prefs.h" | 19 #include "chrome/browser/extensions/test_extension_prefs.h" |
19 #include "chrome/browser/extensions/test_extension_system.h" | 20 #include "chrome/browser/extensions/test_extension_system.h" |
20 #include "chrome/common/chrome_paths.h" | 21 #include "chrome/common/chrome_paths.h" |
21 #include "chrome/common/extensions/api/context_menus.h" | 22 #include "chrome/common/extensions/api/context_menus.h" |
22 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
23 #include "components/prefs/pref_service.h" | 24 #include "components/prefs/pref_service.h" |
(...skipping 28 matching lines...) Expand all Loading... |
52 : ui_thread_(BrowserThread::UI, &message_loop_), | 53 : ui_thread_(BrowserThread::UI, &message_loop_), |
53 file_thread_(BrowserThread::FILE, &message_loop_), | 54 file_thread_(BrowserThread::FILE, &message_loop_), |
54 profile_(new TestingProfile()), | 55 profile_(new TestingProfile()), |
55 manager_(profile_.get(), | 56 manager_(profile_.get(), |
56 ExtensionSystem::Get(profile_.get())->state_store()), | 57 ExtensionSystem::Get(profile_.get())->state_store()), |
57 prefs_(message_loop_.task_runner().get()), | 58 prefs_(message_loop_.task_runner().get()), |
58 next_id_(1) {} | 59 next_id_(1) {} |
59 | 60 |
60 void TearDown() override { | 61 void TearDown() override { |
61 prefs_.pref_service()->CommitPendingWrite(); | 62 prefs_.pref_service()->CommitPendingWrite(); |
62 message_loop_.RunUntilIdle(); | 63 base::RunLoop().RunUntilIdle(); |
63 } | 64 } |
64 | 65 |
65 // Returns a test item. | 66 // Returns a test item. |
66 MenuItem* CreateTestItem(Extension* extension, bool incognito = false) { | 67 MenuItem* CreateTestItem(Extension* extension, bool incognito = false) { |
67 MenuItem::Type type = MenuItem::NORMAL; | 68 MenuItem::Type type = MenuItem::NORMAL; |
68 MenuItem::ContextList contexts(MenuItem::ALL); | 69 MenuItem::ContextList contexts(MenuItem::ALL); |
69 const MenuItem::ExtensionKey key(extension->id()); | 70 const MenuItem::ExtensionKey key(extension->id()); |
70 MenuItem::Id id(incognito, key); | 71 MenuItem::Id id(incognito, key); |
71 id.uid = next_id_++; | 72 id.uid = next_id_++; |
72 return new MenuItem(id, "test", false, true, type, contexts); | 73 return new MenuItem(id, "test", false, true, type, contexts); |
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
744 EXPECT_EQ(4u, manager_.MenuItems(key1)->size()); | 745 EXPECT_EQ(4u, manager_.MenuItems(key1)->size()); |
745 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); | 746 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); |
746 | 747 |
747 // Remove all context menu items with incognito true. | 748 // Remove all context menu items with incognito true. |
748 manager_.RemoveAllIncognitoContextItems(); | 749 manager_.RemoveAllIncognitoContextItems(); |
749 EXPECT_EQ(2u, manager_.MenuItems(key1)->size()); | 750 EXPECT_EQ(2u, manager_.MenuItems(key1)->size()); |
750 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); | 751 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); |
751 } | 752 } |
752 | 753 |
753 } // namespace extensions | 754 } // namespace extensions |
OLD | NEW |