Address some TODOs for ChooserBubbleDelegate class

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

 // Copyright 2015 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/website_settings/chooser_bubble_ui_cocoa.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 276 matching lines @@
   } else {
     [[self window] setFrame:bubbleFrame display:NO];
     [self setAnchorPoint:[self getExpectedAnchorPoint]];
     [self showWindow:nil];
     [[self window] makeFirstResponder:nil];
     [[self window] setInitialFirstResponder:connectButton_.get()];
   }
 }
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)tableView {
-  const std::vector<base::string16>& device_names =
-      chooserBubbleDelegate_->GetOptions();
-  if (device_names.empty()) {
-    return 1;
-  } else {
-    return static_cast<NSInteger>(device_names.size());
-  }
+  return std::max(static_cast<NSInteger>(chooserBubbleDelegate_->NumOptions()),

[Peter Kasting, 2016/01/04 23:54:00]

Nit: Might as well copy the comment from the other file here:

When there are no devices, the table contains a message saying there are no
devices, so the number of rows is always at least 1.

[juncai, 2016/01/05 03:37:27]

Done.

+                  static_cast<NSInteger>(1));
 }
 
 - (id)tableView:(NSTableView*)tableView
     objectValueForTableColumn:(NSTableColumn*)tableColumn
                           row:(NSInteger)rowIndex {
-  const std::vector<base::string16>& device_names =
-      chooserBubbleDelegate_->GetOptions();
-  if (device_names.empty()) {
-    DCHECK(rowIndex == 0);
+  NSInteger num_options =
+      static_cast<NSInteger>(chooserBubbleDelegate_->NumOptions());
+  if (num_options == 0) {
+    DCHECK_EQ(0, rowIndex);
     return l10n_util::GetNSString(IDS_CHOOSER_BUBBLE_NO_DEVICES_FOUND_PROMPT);
-  } else {
-    if (rowIndex >= 0 &&
-        rowIndex < static_cast<NSInteger>(device_names.size())) {
-      return base::SysUTF16ToNSString(device_names[rowIndex]);
-    } else {
-      return @"";
-    }
   }
+
+  DCHECK_GE(rowIndex, 0);
+  DCHECK_LT(rowIndex, num_options);
+  return base::SysUTF16ToNSString(
+      chooserBubbleDelegate_->GetOption(static_cast<size_t>(rowIndex)));
 }
 
 - (BOOL)tableView:(NSTableView*)aTableView
     shouldEditTableColumn:(NSTableColumn*)aTableColumn
                       row:(NSInteger)rowIndex {
   return NO;
 }
 
 - (void)onOptionsInitialized {
   [self updateTableView];
 }
 
 - (void)onOptionAdded:(NSInteger)index {
   [self updateTableView];
 }
 
 - (void)onOptionRemoved:(NSInteger)index {
   // |tableView_| will automatically selects the next item if the current
   // item is removed, so here it tracks if the removed item is the item
   // that was previously selected, if so, deselect it.
   if ([tableView_ selectedRow] == index)
     [tableView_ deselectRow:index];
 
   [self updateTableView];
 }
 
 - (void)updateTableView {
-  const std::vector<base::string16>& device_names =
-      chooserBubbleDelegate_->GetOptions();
-  [tableView_ setEnabled:!device_names.empty()];
+  [tableView_ setEnabled:chooserBubbleDelegate_->NumOptions() > 0];
   [tableView_ reloadData];
 }
 
 - (void)tableViewSelectionDidChange:(NSNotification*)aNotification {
   [connectButton_ setEnabled:[tableView_ numberOfSelectedRows] > 0];
 }
 
 - (void)updateAnchorPosition {
   [self setParentWindow:[self getExpectedParentWindow]];
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
@@ skipping 134 matching lines @@
 }
 
 void ChooserBubbleUiCocoa::UpdateAnchorPosition() {
   [chooser_bubble_ui_controller_ updateAnchorPosition];
 }
 
 void ChooserBubbleUiCocoa::OnOptionsInitialized() {
   [chooser_bubble_ui_controller_ onOptionsInitialized];
 }
 
-void ChooserBubbleUiCocoa::OnOptionAdded(int index) {
-  [chooser_bubble_ui_controller_ onOptionAdded:index];
+void ChooserBubbleUiCocoa::OnOptionAdded(size_t index) {
+  [chooser_bubble_ui_controller_ onOptionAdded:static_cast<NSInteger>(index)];
 }
 
-void ChooserBubbleUiCocoa::OnOptionRemoved(int index) {
-  [chooser_bubble_ui_controller_ onOptionRemoved:index];
+void ChooserBubbleUiCocoa::OnOptionRemoved(size_t index) {
+  [chooser_bubble_ui_controller_ onOptionRemoved:static_cast<NSInteger>(index)];
 }
 
 void ChooserBubbleUiCocoa::OnBubbleClosing() {
   chooser_bubble_ui_controller_ = nil;
 }