Fix crash in ProfileMenuController::validateMenuItem.

chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm

 // Copyright 2014 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.
 
 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
+#include "base/metrics/histogram_macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_interface.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/image/image.h"
 
+namespace {
+// Used in UMA histogram macros, shouldn't be reordered or renumbered
+enum ValidateMenuItemSelector {
+  UNKNOWN_SELECTOR = 0,
+  NEW_PROFILE,
+  EDIT_PROFILE,
+  SWITCH_PROFILE_MENU,
+  SWITCH_PROFILE_DOCK,
+  MAX_VALIDATE_MENU_SELECTOR,
+};
+}

[Alexei Svitkine (slow), 2015/04/23 15:02:54]

Nit: // namespace

Also, put empty lines around the enum definition.

[anthonyvd, 2015/04/23 19:04:57]

Done.

+
 @interface ProfileMenuController (Private)
 - (void)initializeMenu;
 @end
 
 namespace ProfileMenuControllerInternal {
 
 class Observer : public chrome::BrowserListObserver,
                  public AvatarMenuObserver {
  public:
   Observer(ProfileMenuController* controller) : controller_(controller) {
@@ skipping 124 matching lines @@
 
 - (BOOL)validateMenuItem:(NSMenuItem*)menuItem {
   // In guest mode, chrome://settings isn't available, so disallow creating
   // or editing a profile.
   Profile* activeProfile = ProfileManager::GetLastUsedProfile();
   if (activeProfile->IsGuestSession()) {
     return [menuItem action] != @selector(newProfile:) &&
            [menuItem action] != @selector(editProfile:);
   }
 
-  const AvatarMenu::Item& itemData = avatarMenu_->GetItemAt(
-      avatarMenu_->GetActiveProfileIndex());
+  size_t index = avatarMenu_->GetActiveProfileIndex();
+  if (avatarMenu_->GetNumberOfItems() <= index) {
+    ValidateMenuItemSelector current_selector = UNKNOWN_SELECTOR;

[Alexei Svitkine (slow), 2015/04/23 15:02:54]

Use camelCase.

[anthonyvd, 2015/04/23 19:04:57]

Done.

+    if ([menuItem action] == @selector(newProfile:))
+      current_selector = NEW_PROFILE;
+    else if ([menuItem action] == @selector(editProfile:))
+      current_selector = EDIT_PROFILE;
+    else if ([menuItem action] == @selector(switchToProfileFromMenu:))
+      current_selector = SWITCH_PROFILE_MENU;
+    else if ([menuItem action] == @selector(switchToProfileFromDock:))
+      current_selector = SWITCH_PROFILE_DOCK;
+    UMA_HISTOGRAM_BOOLEAN("Profile.ValidateMenuItemInvalidIndex.IsGuest",
+                          activeProfile->IsGuestSession());
+    UMA_HISTOGRAM_CUSTOM_COUNTS(
+        "Profile.ValidateMenuItemInvalidIndex.ProfileCount",
+        avatarMenu_->GetNumberOfItems(),
+        1, 20, 20);
+    UMA_HISTOGRAM_ENUMERATION("Profile.ValidateMenuItemInvalidIndex.Selector",
+                              current_selector,
+                              MAX_VALIDATE_MENU_SELECTOR);
+
+    return NO;
+  }
+
+  const AvatarMenu::Item& itemData = avatarMenu_->GetItemAt(index);
   if ([menuItem action] == @selector(switchToProfileFromDock:) ||
       [menuItem action] == @selector(switchToProfileFromMenu:)) {
     if (!itemData.legacy_supervised)
       return YES;
 
     return [menuItem tag] == static_cast<NSInteger>(itemData.menu_index);
   }
 
   if ([menuItem action] == @selector(newProfile:))
     return !itemData.legacy_supervised;
@@ skipping 79 matching lines @@
 }
 
 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel {
   base::scoped_nsobject<NSMenuItem> item(
       [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]);
   [item setTarget:self];
   return [item.release() autorelease];
 }
 
 @end