Fix bug with context menus in incognito mode.

chrome/browser/extensions/extension_menu_manager_unittest.cc

 // Copyright (c) 2010 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/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/scoped_vector.h"
@@ skipping 19 matching lines @@
 // Base class for tests.
 class ExtensionMenuManagerTest : public testing::Test {
  public:
   ExtensionMenuManagerTest() : next_id_(1) {}
   ~ExtensionMenuManagerTest() {}
 
   // Returns a test item.
   ExtensionMenuItem* CreateTestItem(Extension* extension) {
     ExtensionMenuItem::Type type = ExtensionMenuItem::NORMAL;
     ExtensionMenuItem::ContextList contexts(ExtensionMenuItem::ALL);
-    ExtensionMenuItem::Id id(extension->id(), next_id_++);
+    ExtensionMenuItem::Id id(NULL, extension->id(), next_id_++);
     return new ExtensionMenuItem(id, "test", false, 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;
   }
@@ skipping 36 matching lines @@
   ExtensionMenuItem::Id id3 = item3->id();
   std::string extension_id = item3->extension_id();
   ASSERT_TRUE(manager_.AddContextItem(extension, item3));
   ASSERT_EQ(item3, manager_.GetItemById(id3));
   ASSERT_EQ(3u, manager_.MenuItems(extension_id)->size());
   ASSERT_TRUE(manager_.RemoveContextMenuItem(id3));
   ASSERT_EQ(NULL, manager_.GetItemById(id3));
   ASSERT_EQ(2u, manager_.MenuItems(extension_id)->size());
 
   // Make sure removing a non-existent item returns false.
-  ExtensionMenuItem::Id id(extension->id(), id3.second + 50);
+  ExtensionMenuItem::Id id(NULL, extension->id(), id3.uid + 50);
   ASSERT_FALSE(manager_.RemoveContextMenuItem(id));
 }
 
 // Test adding/removing child items.
 TEST_F(ExtensionMenuManagerTest, ChildFunctions) {
   Extension* extension1 = AddExtension("1111");
   Extension* extension2 = AddExtension("2222");
   Extension* extension3 = AddExtension("3333");
 
   ExtensionMenuItem* item1 = CreateTestItem(extension1);
@@ skipping 346 matching lines @@
   ASSERT_TRUE(result.get() != NULL);
   ASSERT_EQ(Value::TYPE_LIST, value->GetType());
   ListValue* list = static_cast<ListValue*>(value);
   ASSERT_EQ(2u, list->GetSize());
 
   DictionaryValue* info;
   ASSERT_TRUE(list->GetDictionary(0, &info));
 
   int tmp_id = 0;
   ASSERT_TRUE(info->GetInteger("menuItemId", &tmp_id));
-  ASSERT_EQ(id.second, tmp_id);
+  ASSERT_EQ(id.uid, tmp_id);
 
   std::string tmp;
   ASSERT_TRUE(info->GetString("mediaType", &tmp));
   ASSERT_EQ("image", tmp);
   ASSERT_TRUE(info->GetString("srcUrl", &tmp));
   ASSERT_EQ(params.src_url.spec(), tmp);
   ASSERT_TRUE(info->GetString("pageUrl", &tmp));
   ASSERT_EQ(params.page_url.spec(), tmp);
 
   ASSERT_TRUE(info->GetString("selectionText", &tmp));
   ASSERT_EQ(WideToUTF8(params.selection_text), tmp);
 
   bool bool_tmp = true;
   ASSERT_TRUE(info->GetBoolean("editable", &bool_tmp));
   ASSERT_EQ(params.is_editable, bool_tmp);
 }