<webview>: Context menu API implementation CL.

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/message_loop.h"
@@ skipping 44 matching lines @@
 
   virtual void TearDown() OVERRIDE {
     prefs_.pref_service()->CommitPendingWrite();
     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());
+    const MenuItem::ExtensionKey key(extension->id());
+    MenuItem::Id id(incognito, key);
     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());
+    const MenuItem::ExtensionKey key(extension->id());
+    MenuItem::Id id(false, key);
     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);
     extensions_.push_back(extension);
     return extension.get();
@@ skipping 16 matching lines @@
 
 // Tests adding, getting, and removing items.
 TEST_F(MenuManagerTest, AddGetRemoveItems) {
   Extension* extension = AddExtension("test");
 
   // Add a new item, make sure you can get it back.
   MenuItem* item1 = CreateTestItem(extension);
   ASSERT_TRUE(item1 != NULL);
   ASSERT_TRUE(manager_.AddContextItem(extension, item1));
   ASSERT_EQ(item1, manager_.GetItemById(item1->id()));
-  const MenuItem::List* items = manager_.MenuItems(item1->extension_id());
+  const MenuItem::List* items = manager_.MenuItems(item1->id().extension_key);
   ASSERT_EQ(1u, items->size());
   ASSERT_EQ(item1, items->at(0));
 
   // Add a second item, make sure it comes back too.
   MenuItem* item2 = CreateTestItemWithID(extension, "id2");
   ASSERT_TRUE(manager_.AddContextItem(extension, item2));
   ASSERT_EQ(item2, manager_.GetItemById(item2->id()));
-  items = manager_.MenuItems(item2->extension_id());
+  items = manager_.MenuItems(item2->id().extension_key);
   ASSERT_EQ(2u, items->size());
   ASSERT_EQ(item1, items->at(0));
   ASSERT_EQ(item2, items->at(1));
 
   // Try adding item 3, then removing it.
   MenuItem* item3 = CreateTestItem(extension);
   MenuItem::Id id3 = item3->id();
-  std::string extension_id = item3->extension_id();
+  const MenuItem::ExtensionKey extension_key3(item3->id().extension_key);
   ASSERT_TRUE(manager_.AddContextItem(extension, item3));
   ASSERT_EQ(item3, manager_.GetItemById(id3));
-  ASSERT_EQ(3u, manager_.MenuItems(extension_id)->size());
+  ASSERT_EQ(3u, manager_.MenuItems(extension_key3)->size());
   ASSERT_TRUE(manager_.RemoveContextMenuItem(id3));
   ASSERT_EQ(NULL, manager_.GetItemById(id3));
-  ASSERT_EQ(2u, manager_.MenuItems(extension_id)->size());
+  ASSERT_EQ(2u, manager_.MenuItems(extension_key3)->size());
 
   // Make sure removing a non-existent item returns false.
-  MenuItem::Id id(false, extension->id());
+  const MenuItem::ExtensionKey key(extension->id());
+  MenuItem::Id id(false, key);
   id.uid = id3.uid + 50;
   ASSERT_FALSE(manager_.RemoveContextMenuItem(id));
 
   // Make sure adding an item with the same string ID returns false.
   scoped_ptr<MenuItem> item2too(CreateTestItemWithID(extension, "id2"));
   ASSERT_FALSE(manager_.AddContextItem(extension, item2too.get()));
 
   // But the same string ID should not collide with another extension.
   Extension* extension2 = AddExtension("test2");
   MenuItem* item2other = CreateTestItemWithID(extension2, "id2");
@@ skipping 26 matching lines @@
   // a different extension id.
   ASSERT_FALSE(manager_.AddChildItem(id2, item3.get()));
 
   // Add item2_child as a child of item2.
   MenuItem::Id id2_child = item2_child->id();
   ASSERT_TRUE(manager_.AddChildItem(id2, item2_child));
   ASSERT_EQ(1, item2->child_count());
   ASSERT_EQ(0, item1->child_count());
   ASSERT_EQ(item2_child, manager_.GetItemById(id2_child));
 
-  ASSERT_EQ(1u, manager_.MenuItems(item1->extension_id())->size());
-  ASSERT_EQ(item1, manager_.MenuItems(item1->extension_id())->at(0));
+  ASSERT_EQ(1u, manager_.MenuItems(item1->id().extension_key)->size());
+  ASSERT_EQ(item1, manager_.MenuItems(item1->id().extension_key)->at(0));
 
   // Add item2_grandchild as a child of item2_child, then remove it.
   MenuItem::Id id2_grandchild = item2_grandchild->id();
   ASSERT_TRUE(manager_.AddChildItem(id2_child, item2_grandchild));
   ASSERT_EQ(1, item2->child_count());
   ASSERT_EQ(1, item2_child->child_count());
   ASSERT_TRUE(manager_.RemoveContextMenuItem(id2_grandchild));
 
   // We should only get 1 thing back when asking for item2's extension id, since
   // it has a child item.
-  ASSERT_EQ(1u, manager_.MenuItems(item2->extension_id())->size());
-  ASSERT_EQ(item2, manager_.MenuItems(item2->extension_id())->at(0));
+  ASSERT_EQ(1u, manager_.MenuItems(item2->id().extension_key)->size());
+  ASSERT_EQ(item2, manager_.MenuItems(item2->id().extension_key)->at(0));
 
   // Remove child2_item.
   ASSERT_TRUE(manager_.RemoveContextMenuItem(id2_child));
-  ASSERT_EQ(1u, manager_.MenuItems(item2->extension_id())->size());
-  ASSERT_EQ(item2, manager_.MenuItems(item2->extension_id())->at(0));
+  ASSERT_EQ(1u, manager_.MenuItems(item2->id().extension_key)->size());
+  ASSERT_EQ(item2, manager_.MenuItems(item2->id().extension_key)->at(0));
   ASSERT_EQ(0, item2->child_count());
 }
 
 TEST_F(MenuManagerTest, PopulateFromValue) {
   Extension* extension = AddExtension("test");
 
   bool incognito = true;
   int type = MenuItem::CHECKBOX;
   std::string title("TITLE");
   bool checked = true;
@@ skipping 64 matching lines @@
   MenuItem* item3 = CreateTestItemWithID(extension, "id3");
   MenuItem* item4 = CreateTestItemWithID(extension, "id4");
   MenuItem* item5 = CreateTestItem(extension);
   MenuItem* item6 = CreateTestItem(extension);
   MenuItem::Id item1_id = item1->id();
   MenuItem::Id item2_id = item2->id();
   MenuItem::Id item3_id = item3->id();
   MenuItem::Id item4_id = item4->id();
   MenuItem::Id item5_id = item5->id();
   MenuItem::Id item6_id = item6->id();
+  const MenuItem::ExtensionKey key(extension->id());
 
   // Add the items in the hierarchy
   // item1 -> item2 -> item3 -> item4 -> item5 -> item6.
   ASSERT_TRUE(manager_.AddContextItem(extension, item1));
   ASSERT_TRUE(manager_.AddChildItem(item1_id, item2));
   ASSERT_TRUE(manager_.AddChildItem(item2_id, item3));
   ASSERT_TRUE(manager_.AddChildItem(item3_id, item4));
   ASSERT_TRUE(manager_.AddChildItem(item4_id, item5));
   ASSERT_TRUE(manager_.AddChildItem(item5_id, item6));
   ASSERT_EQ(item1, manager_.GetItemById(item1_id));
   ASSERT_EQ(item2, manager_.GetItemById(item2_id));
   ASSERT_EQ(item3, manager_.GetItemById(item3_id));
   ASSERT_EQ(item4, manager_.GetItemById(item4_id));
   ASSERT_EQ(item5, manager_.GetItemById(item5_id));
   ASSERT_EQ(item6, manager_.GetItemById(item6_id));
-  ASSERT_EQ(1u, manager_.MenuItems(extension->id())->size());
+  ASSERT_EQ(1u, manager_.MenuItems(key)->size());
   ASSERT_EQ(6u, manager_.items_by_id_.size());
 
   // Remove item6 (a leaf node).
   ASSERT_TRUE(manager_.RemoveContextMenuItem(item6_id));
   ASSERT_EQ(item1, manager_.GetItemById(item1_id));
   ASSERT_EQ(item2, manager_.GetItemById(item2_id));
   ASSERT_EQ(item3, manager_.GetItemById(item3_id));
   ASSERT_EQ(item4, manager_.GetItemById(item4_id));
   ASSERT_EQ(item5, manager_.GetItemById(item5_id));
   ASSERT_EQ(NULL, manager_.GetItemById(item6_id));
-  ASSERT_EQ(1u, manager_.MenuItems(extension->id())->size());
+  ASSERT_EQ(1u, manager_.MenuItems(key)->size());
   ASSERT_EQ(5u, manager_.items_by_id_.size());
 
   // Remove item4 and make sure item5 is gone as well.
   ASSERT_TRUE(manager_.RemoveContextMenuItem(item4_id));
   ASSERT_EQ(item1, manager_.GetItemById(item1_id));
   ASSERT_EQ(item2, manager_.GetItemById(item2_id));
   ASSERT_EQ(item3, manager_.GetItemById(item3_id));
   ASSERT_EQ(NULL, manager_.GetItemById(item4_id));
   ASSERT_EQ(NULL, manager_.GetItemById(item5_id));
-  ASSERT_EQ(1u, manager_.MenuItems(extension->id())->size());
+  ASSERT_EQ(1u, manager_.MenuItems(key)->size());
   ASSERT_EQ(3u, manager_.items_by_id_.size());
 
   // Now remove item1 and make sure item2 and item3 are gone as well.
   ASSERT_TRUE(manager_.RemoveContextMenuItem(item1_id));
-  ASSERT_EQ(NULL, manager_.MenuItems(extension->id()));
+  ASSERT_EQ(NULL, manager_.MenuItems(key));
   ASSERT_EQ(0u, manager_.items_by_id_.size());
   ASSERT_EQ(NULL, manager_.GetItemById(item1_id));
   ASSERT_EQ(NULL, manager_.GetItemById(item2_id));
   ASSERT_EQ(NULL, manager_.GetItemById(item3_id));
 }
 
 // Tests changing parents.
 TEST_F(MenuManagerTest, ChangeParent) {
   Extension* extension1 = AddExtension("1111");
 
   // First create two items and add them both to the manager.
   MenuItem* item1 = CreateTestItem(extension1);
   MenuItem* item2 = CreateTestItem(extension1);
 
   ASSERT_TRUE(manager_.AddContextItem(extension1, item1));
   ASSERT_TRUE(manager_.AddContextItem(extension1, item2));
 
-  const MenuItem::List* items = manager_.MenuItems(item1->extension_id());
+  const MenuItem::List* items = manager_.MenuItems(item1->id().extension_key);
   ASSERT_EQ(2u, items->size());
   ASSERT_EQ(item1, items->at(0));
   ASSERT_EQ(item2, items->at(1));
 
   // Now create a third item, initially add it as a child of item1, then move
   // it to be a child of item2.
   MenuItem* item3 = CreateTestItem(extension1);
 
   ASSERT_TRUE(manager_.AddChildItem(item1->id(), item3));
   ASSERT_EQ(1, item1->child_count());
   ASSERT_EQ(item3, item1->children()[0]);
 
   ASSERT_TRUE(manager_.ChangeParent(item3->id(), &item2->id()));
   ASSERT_EQ(0, item1->child_count());
   ASSERT_EQ(1, item2->child_count());
   ASSERT_EQ(item3, item2->children()[0]);
 
   // Move item2 to be a child of item1.
   ASSERT_TRUE(manager_.ChangeParent(item2->id(), &item1->id()));
   ASSERT_EQ(1, item1->child_count());
   ASSERT_EQ(item2, item1->children()[0]);
   ASSERT_EQ(1, item2->child_count());
   ASSERT_EQ(item3, item2->children()[0]);
 
   // Since item2 was a top-level item but is no longer, we should only have 1
   // top-level item.
-  items = manager_.MenuItems(item1->extension_id());
+  items = manager_.MenuItems(item1->id().extension_key);
   ASSERT_EQ(1u, items->size());
   ASSERT_EQ(item1, items->at(0));
 
   // Move item3 back to being a child of item1, so it's now a sibling of item2.
   ASSERT_TRUE(manager_.ChangeParent(item3->id(), &item1->id()));
   ASSERT_EQ(2, item1->child_count());
   ASSERT_EQ(item2, item1->children()[0]);
   ASSERT_EQ(item3, item1->children()[1]);
 
   // Try switching item3 to be the parent of item1 - this should fail.
   ASSERT_FALSE(manager_.ChangeParent(item1->id(), &item3->id()));
   ASSERT_EQ(0, item3->child_count());
   ASSERT_EQ(2, item1->child_count());
   ASSERT_EQ(item2, item1->children()[0]);
   ASSERT_EQ(item3, item1->children()[1]);
-  items = manager_.MenuItems(item1->extension_id());
+  items = manager_.MenuItems(item1->id().extension_key);
   ASSERT_EQ(1u, items->size());
   ASSERT_EQ(item1, items->at(0));
 
   // Move item2 to be a top-level item.
   ASSERT_TRUE(manager_.ChangeParent(item2->id(), NULL));
-  items = manager_.MenuItems(item1->extension_id());
+  items = manager_.MenuItems(item1->id().extension_key);
   ASSERT_EQ(2u, items->size());
   ASSERT_EQ(item1, items->at(0));
   ASSERT_EQ(item2, items->at(1));
   ASSERT_EQ(1, item1->child_count());
   ASSERT_EQ(item3, item1->children()[0]);
 
   // Make sure you can't move a node to be a child of another extension's item.
   Extension* extension2 = AddExtension("2222");
   MenuItem* item4 = CreateTestItem(extension2);
   ASSERT_TRUE(manager_.AddContextItem(extension2, item4));
@@ skipping 12 matching lines @@
   ASSERT_TRUE(notifier != NULL);
 
   // Create a test extension.
   Extension* extension1 = AddExtension("1111");
 
   // Create an MenuItem and put it into the manager.
   MenuItem* item1 = CreateTestItem(extension1);
   MenuItem::Id id1 = item1->id();
   ASSERT_EQ(extension1->id(), item1->extension_id());
   ASSERT_TRUE(manager_.AddContextItem(extension1, item1));
-  ASSERT_EQ(1u, manager_.MenuItems(extension1->id())->size());
+  ASSERT_EQ(
+      1u, manager_.MenuItems(MenuItem::ExtensionKey(extension1->id()))->size());
 
   // Create a menu item with a different extension id and add it to the manager.
   Extension* extension2 = AddExtension("2222");
   MenuItem* item2 = CreateTestItem(extension2);
   ASSERT_NE(item1->extension_id(), item2->extension_id());
   ASSERT_TRUE(manager_.AddContextItem(extension2, item2));
 
   // Notify that the extension was unloaded, and make sure the right item is
   // gone.
   UnloadedExtensionInfo details(
       extension1, UnloadedExtensionInfo::REASON_DISABLE);
   notifier->Notify(chrome::NOTIFICATION_EXTENSION_UNLOADED,
                    content::Source<Profile>(&profile_),
                    content::Details<UnloadedExtensionInfo>(
                       &details));
-  ASSERT_EQ(NULL, manager_.MenuItems(extension1->id()));
-  ASSERT_EQ(1u, manager_.MenuItems(extension2->id())->size());
+  ASSERT_EQ(NULL, manager_.MenuItems(MenuItem::ExtensionKey(extension1->id())));
+  ASSERT_EQ(
+      1u, manager_.MenuItems(MenuItem::ExtensionKey(extension2->id()))->size());
   ASSERT_TRUE(manager_.GetItemById(id1) == NULL);
   ASSERT_TRUE(manager_.GetItemById(item2->id()) != NULL);
 }
 
 // A mock message service for tests of MenuManager::ExecuteCommand.
 class MockEventRouter : public EventRouter {
  public:
   explicit MockEventRouter(Profile* profile) : EventRouter(profile, NULL) {}
 
   MOCK_METHOD6(DispatchEventToExtensionMock,
@@ skipping 37 matching lines @@
 };
 
 BrowserContextKeyedService* BuildMockExtensionSystem(
     content::BrowserContext* profile) {
   return new MockExtensionSystem(static_cast<Profile*>(profile));
 }
 
 // Tests the RemoveAll functionality.
 TEST_F(MenuManagerTest, RemoveAll) {
   // Try removing all items for an extension id that doesn't have any items.
-  manager_.RemoveAllContextItems("CCCC");
+  manager_.RemoveAllContextItems(MenuItem::ExtensionKey("CCCC"));
 
   // Add 2 top-level and one child item for extension 1.
   Extension* extension1 = AddExtension("1111");
   MenuItem* item1 = CreateTestItem(extension1);
   MenuItem* item2 = CreateTestItem(extension1);
   MenuItem* item3 = CreateTestItem(extension1);
   ASSERT_TRUE(manager_.AddContextItem(extension1, item1));
   ASSERT_TRUE(manager_.AddContextItem(extension1, item2));
   ASSERT_TRUE(manager_.AddChildItem(item1->id(), item3));
 
   // Add one top-level item for extension 2.
   Extension* extension2 = AddExtension("2222");
   MenuItem* item4 = CreateTestItem(extension2);
   ASSERT_TRUE(manager_.AddContextItem(extension2, item4));
 
-  EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
-  EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
+  const MenuItem::ExtensionKey key1(extension1->id());
+  const MenuItem::ExtensionKey key2(extension2->id());
+  EXPECT_EQ(2u, manager_.MenuItems(key1)->size());
+  EXPECT_EQ(1u, manager_.MenuItems(key2)->size());
 
   // Remove extension2's item.
-  manager_.RemoveAllContextItems(extension2->id());
-  EXPECT_EQ(2u, manager_.MenuItems(extension1->id())->size());
-  EXPECT_EQ(NULL, manager_.MenuItems(extension2->id()));
+  manager_.RemoveAllContextItems(key2);
+  EXPECT_EQ(2u, manager_.MenuItems(key1)->size());
+  EXPECT_EQ(NULL, manager_.MenuItems(key2));
 
   // Remove extension1's items.
-  manager_.RemoveAllContextItems(extension1->id());
-  EXPECT_EQ(NULL, manager_.MenuItems(extension1->id()));
+  manager_.RemoveAllContextItems(key1);
+  EXPECT_EQ(NULL, manager_.MenuItems(key1));
 }
 
 // Tests that removing all items one-by-one doesn't leave an entry around.
 TEST_F(MenuManagerTest, RemoveOneByOne) {
   // Add 2 test items.
   Extension* extension1 = AddExtension("1111");
   MenuItem* item1 = CreateTestItem(extension1);
   MenuItem* item2 = CreateTestItem(extension1);
   MenuItem* item3 = CreateTestItemWithID(extension1, "id3");
   ASSERT_TRUE(manager_.AddContextItem(extension1, item1));
@@ skipping 201 matching lines @@
   MenuItem* item6 = CreateTestItem(extension1);
   ASSERT_TRUE(manager_.AddContextItem(extension1, item4));
   ASSERT_TRUE(manager_.AddContextItem(extension1, item5));
   ASSERT_TRUE(manager_.AddChildItem(item4->id(), item6));
 
   // Add one top-level item for extension 2.
   Extension* extension2 = AddExtension("2222");
   MenuItem* item7 = CreateTestItem(extension2);
   ASSERT_TRUE(manager_.AddContextItem(extension2, item7));
 
-  EXPECT_EQ(4u, manager_.MenuItems(extension1->id())->size());
-  EXPECT_EQ(1u, manager_.MenuItems(extension2->id())->size());
+  const MenuItem::ExtensionKey key1(extension1->id());
+  const MenuItem::ExtensionKey key2(extension2->id());
+  EXPECT_EQ(4u, manager_.MenuItems(key1)->size());
+  EXPECT_EQ(1u, manager_.MenuItems(key2)->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());
+  EXPECT_EQ(2u, manager_.MenuItems(key1)->size());
+  EXPECT_EQ(1u, manager_.MenuItems(key2)->size());
 }
 
 }  // namespace extensions