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 <utility> |
8 #include <vector> | 9 #include <vector> |
9 | 10 |
10 #include "base/files/scoped_temp_dir.h" | 11 #include "base/files/scoped_temp_dir.h" |
11 #include "base/json/json_reader.h" | 12 #include "base/json/json_reader.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
14 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
15 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
16 #include "base/threading/thread_task_runner_handle.h" | 17 #include "base/threading/thread_task_runner_handle.h" |
17 #include "base/values.h" | 18 #include "base/values.h" |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 int type = MenuItem::CHECKBOX; | 225 int type = MenuItem::CHECKBOX; |
225 std::string title("TITLE"); | 226 std::string title("TITLE"); |
226 bool checked = true; | 227 bool checked = true; |
227 bool enabled = true; | 228 bool enabled = true; |
228 MenuItem::ContextList contexts; | 229 MenuItem::ContextList contexts; |
229 contexts.Add(MenuItem::PAGE); | 230 contexts.Add(MenuItem::PAGE); |
230 contexts.Add(MenuItem::SELECTION); | 231 contexts.Add(MenuItem::SELECTION); |
231 int contexts_value = 0; | 232 int contexts_value = 0; |
232 ASSERT_TRUE(contexts.ToValue()->GetAsInteger(&contexts_value)); | 233 ASSERT_TRUE(contexts.ToValue()->GetAsInteger(&contexts_value)); |
233 | 234 |
234 base::ListValue* document_url_patterns(new base::ListValue()); | 235 auto document_url_patterns = base::MakeUnique<base::ListValue>(); |
235 document_url_patterns->AppendString("http://www.google.com/*"); | 236 document_url_patterns->AppendString("http://www.google.com/*"); |
236 document_url_patterns->AppendString("http://www.reddit.com/*"); | 237 document_url_patterns->AppendString("http://www.reddit.com/*"); |
237 | 238 |
238 base::ListValue* target_url_patterns(new base::ListValue()); | 239 auto target_url_patterns = base::MakeUnique<base::ListValue>(); |
239 target_url_patterns->AppendString("http://www.yahoo.com/*"); | 240 target_url_patterns->AppendString("http://www.yahoo.com/*"); |
240 target_url_patterns->AppendString("http://www.facebook.com/*"); | 241 target_url_patterns->AppendString("http://www.facebook.com/*"); |
241 | 242 |
242 base::DictionaryValue value; | 243 base::DictionaryValue value; |
243 value.SetBoolean("incognito", incognito); | 244 value.SetBoolean("incognito", incognito); |
244 value.SetString("string_uid", std::string()); | 245 value.SetString("string_uid", std::string()); |
245 value.SetInteger("type", type); | 246 value.SetInteger("type", type); |
246 value.SetString("title", title); | 247 value.SetString("title", title); |
247 value.SetBoolean("checked", checked); | 248 value.SetBoolean("checked", checked); |
248 value.SetBoolean("enabled", enabled); | 249 value.SetBoolean("enabled", enabled); |
249 value.SetInteger("contexts", contexts_value); | 250 value.SetInteger("contexts", contexts_value); |
250 value.Set("document_url_patterns", document_url_patterns); | 251 std::string error; |
251 value.Set("target_url_patterns", target_url_patterns); | 252 URLPatternSet document_url_pattern_set; |
| 253 document_url_pattern_set.Populate(*document_url_patterns, |
| 254 URLPattern::SCHEME_ALL, true, &error); |
| 255 value.Set("document_url_patterns", std::move(document_url_patterns)); |
| 256 URLPatternSet target_url_pattern_set; |
| 257 target_url_pattern_set.Populate(*target_url_patterns, URLPattern::SCHEME_ALL, |
| 258 true, &error); |
| 259 value.Set("target_url_patterns", std::move(target_url_patterns)); |
252 | 260 |
253 std::string error; | |
254 std::unique_ptr<MenuItem> item( | 261 std::unique_ptr<MenuItem> item( |
255 MenuItem::Populate(extension->id(), value, &error)); | 262 MenuItem::Populate(extension->id(), value, &error)); |
256 ASSERT_TRUE(item.get()); | 263 ASSERT_TRUE(item.get()); |
257 | 264 |
258 EXPECT_EQ(extension->id(), item->extension_id()); | 265 EXPECT_EQ(extension->id(), item->extension_id()); |
259 EXPECT_EQ(incognito, item->incognito()); | 266 EXPECT_EQ(incognito, item->incognito()); |
260 EXPECT_EQ(title, item->title()); | 267 EXPECT_EQ(title, item->title()); |
261 EXPECT_EQ(checked, item->checked()); | 268 EXPECT_EQ(checked, item->checked()); |
262 EXPECT_EQ(item->checked(), item->checked()); | 269 EXPECT_EQ(item->checked(), item->checked()); |
263 EXPECT_EQ(enabled, item->enabled()); | 270 EXPECT_EQ(enabled, item->enabled()); |
264 EXPECT_EQ(contexts, item->contexts()); | 271 EXPECT_EQ(contexts, item->contexts()); |
265 | 272 |
266 URLPatternSet document_url_pattern_set; | |
267 document_url_pattern_set.Populate(*document_url_patterns, | |
268 URLPattern::SCHEME_ALL, | |
269 true, | |
270 &error); | |
271 EXPECT_EQ(document_url_pattern_set, item->document_url_patterns()); | 273 EXPECT_EQ(document_url_pattern_set, item->document_url_patterns()); |
272 | 274 |
273 URLPatternSet target_url_pattern_set; | |
274 target_url_pattern_set.Populate(*target_url_patterns, | |
275 URLPattern::SCHEME_ALL, | |
276 true, | |
277 &error); | |
278 EXPECT_EQ(target_url_pattern_set, item->target_url_patterns()); | 275 EXPECT_EQ(target_url_pattern_set, item->target_url_patterns()); |
279 } | 276 } |
280 | 277 |
281 // Tests that deleting a parent properly removes descendants. | 278 // Tests that deleting a parent properly removes descendants. |
282 TEST_F(MenuManagerTest, DeleteParent) { | 279 TEST_F(MenuManagerTest, DeleteParent) { |
283 Extension* extension = AddExtension("1111"); | 280 Extension* extension = AddExtension("1111"); |
284 | 281 |
285 // Set up 5 items to add. | 282 // Set up 5 items to add. |
286 std::unique_ptr<MenuItem> item1 = CreateTestItem(extension); | 283 std::unique_ptr<MenuItem> item1 = CreateTestItem(extension); |
287 std::unique_ptr<MenuItem> item2 = CreateTestItem(extension); | 284 std::unique_ptr<MenuItem> item2 = CreateTestItem(extension); |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
772 EXPECT_EQ(4u, manager_.MenuItems(key1)->size()); | 769 EXPECT_EQ(4u, manager_.MenuItems(key1)->size()); |
773 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); | 770 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); |
774 | 771 |
775 // Remove all context menu items with incognito true. | 772 // Remove all context menu items with incognito true. |
776 manager_.RemoveAllIncognitoContextItems(); | 773 manager_.RemoveAllIncognitoContextItems(); |
777 EXPECT_EQ(2u, manager_.MenuItems(key1)->size()); | 774 EXPECT_EQ(2u, manager_.MenuItems(key1)->size()); |
778 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); | 775 EXPECT_EQ(1u, manager_.MenuItems(key2)->size()); |
779 } | 776 } |
780 | 777 |
781 } // namespace extensions | 778 } // namespace extensions |
OLD | NEW |