Remove CONTENT_SETTINGS_NUM_TYPES (part 2)

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsobject.h"
@@ skipping 84 matching lines @@
         anchoredAt:NSMakePoint(50, 20)];
 
   EXPECT_TRUE(controller);
   EXPECT_TRUE([[controller window] isVisible]);
 
   return controller;
 }
 
 // Check that the bubble doesn't crash or leak for any settings type
 TEST_F(ContentSettingBubbleControllerTest, Init) {
-  for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
-    if (i == CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
-        i == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE ||
-        i == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
-        i == CONTENT_SETTINGS_TYPE_MOUSELOCK ||
-        i == CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
-        i == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
-        i == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
-        i == CONTENT_SETTINGS_TYPE_PPAPI_BROKER ||
-        i == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
-        i == CONTENT_SETTINGS_TYPE_PUSH_MESSAGING ||
-        i == CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS ||
-        i == CONTENT_SETTINGS_TYPE_APP_BANNER ||
-        i == CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT ||
-        i == CONTENT_SETTINGS_TYPE_DURABLE_STORAGE) {
-      // These types have no bubble.
+  for (ContentSettingsType type :
+       ContentSettingBubbleModel::GetSupportedBubbleTypes()) {
+    // Media stream is tested in the MediaStreamBubble test below.
+    if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM ||
+        type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
+        type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
       continue;
     }
-
-    ContentSettingsType settingsType = static_cast<ContentSettingsType>(i);
-
-    ContentSettingBubbleController* controller =
-        CreateBubbleController(settingsType);
+    ContentSettingBubbleController* controller = CreateBubbleController(type);
     EXPECT_EQ(0u, [controller mediaMenus]->size());
     [parent_ close];
   }
 }
 
 // Check that the bubble works for CONTENT_SETTINGS_TYPE_MEDIASTREAM.
 TEST_F(ContentSettingBubbleControllerTest, MediaStreamBubble) {
   MediaCaptureDevicesDispatcher::GetInstance()->
       DisableDeviceEnumerationForTesting();
   ContentSettingBubbleController* controller =
       CreateBubbleController(CONTENT_SETTINGS_TYPE_MEDIASTREAM);

[tapted, 2015/09/07 05:39:21]

Should this iterate over _MIC and _CAMERA as well so there's coverage?
Alternatively, in the Init test, what about something like

size_t expected_menu_size = 0;
if (MEDIASTREAM || _MIC || _CAMERA)
  expected_menu_size = 2;
EXPECT_EQ(expected_menu_isze, [controller mediaMenus]->size());

   content_setting_bubble::MediaMenuPartsMap* mediaMenus =
       [controller mediaMenus];
   EXPECT_EQ(2u, mediaMenus->size());
   NSString* title = l10n_util::GetNSString(IDS_MEDIA_MENU_NO_DEVICE_TITLE);
   for (content_setting_bubble::MediaMenuPartsMap::const_iterator i =
        mediaMenus->begin(); i != mediaMenus->end(); ++i) {
     EXPECT_TRUE((content::MEDIA_DEVICE_AUDIO_CAPTURE == i->second->type) ||
                 (content::MEDIA_DEVICE_VIDEO_CAPTURE == i->second->type));
     EXPECT_EQ(0, [i->first numberOfItems]);
     EXPECT_NSEQ(title, [i->first title]);
     EXPECT_FALSE([i->first isEnabled]);
   }
 
  [parent_ close];
 }
 
 }  // namespace