Fix an off-by-one error in checking # of action context menu items in

chrome/browser/extensions/extension_context_menu_model_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 "chrome/browser/extensions/extension_context_menu_model.h"
 
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/menu_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/extensions/api/context_menus.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/test_management_policy.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace extensions {
 
 namespace {
 
+// Label for test extension menu item.
+const char* kTestExtensionItemLabel = "test-ext-item";
+
 // Build an extension to pass to the menu constructor, with the an action
 // specified by |action_key|.
 scoped_refptr<const Extension> BuildExtension(const std::string& name,
                                               const char* action_key,
                                               Manifest::Location location) {
   return ExtensionBuilder()
       .SetManifest(DictionaryBuilder()
                        .Set("name", name)
                        .Set("version", "1")
                        .Set("manifest_version", 2)
@@ skipping 33 matching lines @@
   // and adds it to |manager|. Refreshes |model| to show new item.
   void AddContextItemAndRefreshModel(MenuManager* manager,
                                      const Extension* extension,
                                      MenuItem::Context context,
                                      ExtensionContextMenuModel* model);
 
   // Reinitializes the given |model|.
   void RefreshMenu(ExtensionContextMenuModel* model);
 
   // Returns the number of extension menu items that show up in |model|.
+  // For this test, all the extension items have samel label
+  // |kTestExtensionItemLabel|.
   int CountExtensionItems(ExtensionContextMenuModel* model);
 
  private:
   int cur_id_;
 };
 
 ExtensionContextMenuModelTest::ExtensionContextMenuModelTest() : cur_id_(0) {
 }
 
 
 void ExtensionContextMenuModelTest::AddContextItemAndRefreshModel(
     MenuManager* manager,
     const Extension* extension,
     MenuItem::Context context,
     ExtensionContextMenuModel* model) {
   MenuItem::Type type = MenuItem::NORMAL;
   MenuItem::ContextList contexts(context);
   const MenuItem::ExtensionKey key(extension->id());
   MenuItem::Id id(false, key);
   id.uid = ++cur_id_;
-  manager->AddContextItem(extension,
-                          new MenuItem(id,
-                                       "test",
-                                       false,  // checked
-                                       true,   // enabled
-                                       type,
-                                       contexts));
+  manager->AddContextItem(extension, new MenuItem(id, kTestExtensionItemLabel,
+                                                  false,  // checked
+                                                  true,   // enabled
+                                                  type, contexts));
   RefreshMenu(model);
 }
 
 void ExtensionContextMenuModelTest::RefreshMenu(
     ExtensionContextMenuModel* model) {
+  model->Clear();

[lazyboy, 2015/05/08 22:53:39]

This used to be a bug in the test.

   model->InitMenu(model->GetExtension(), ExtensionContextMenuModel::VISIBLE);
 }
 
 int ExtensionContextMenuModelTest::CountExtensionItems(
     ExtensionContextMenuModel* model) {
-  return model->extension_items_count_;
+  base::string16 expected_label = base::ASCIIToUTF16(kTestExtensionItemLabel);
+  int num_items_found = 0;
+  for (int i = 0; i < model->GetItemCount(); ++i) {
+    if (expected_label == model->GetLabelAt(i))
+      ++num_items_found;
+  }
+  EXPECT_EQ(num_items_found, model->extension_items_count_);
+  return num_items_found;
 }
 
 // Tests that applicable menu items are disabled when a ManagementPolicy
 // prohibits them.
 TEST_F(ExtensionContextMenuModelTest, RequiredInstallationsDisablesItems) {
   InitializeEmptyExtensionService();
 
   // First, test that a component extension cannot be uninstalled by the
   // standard management policy.
   scoped_refptr<const Extension> extension =
@@ skipping 178 matching lines @@
              browser_action.get(),
              browser.get(),
              ExtensionContextMenuModel::TRANSITIVELY_VISIBLE,
              nullptr);
   index = GetCommandIndex(menu, visibility_command);
   EXPECT_NE(-1, index);
   EXPECT_EQ(redesign_keep_string, menu->GetLabelAt(index));
 }
 
 }  // namespace extensions