Remove usage of the generic multiple permissions update string.

chrome/browser/permissions/permission_update_infobar_delegate_android.cc

 // 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.
 
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 
 #include <memory>
 
 #include "base/android/jni_array.h"
 #include "base/callback_helpers.h"
@@ skipping 18 matching lines @@
     const PermissionUpdatedCallback& callback) {
   DCHECK(ShouldShowPermissionInfobar(web_contents, content_settings_types))
       << "Caller should check ShouldShowPermissionInfobar before creating the "
       << "infobar.";
 
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents);
   ui::WindowAndroid* window_android = cvc->GetWindowAndroid();
 
   std::vector<std::string> permissions;
-  int missing_permission_count = 0;
-  int message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
+  int message_id = -1;
 
   for (ContentSettingsType content_settings_type : content_settings_types) {
     int previous_size = permissions.size();
     PrefServiceBridge::GetAndroidPermissionsForContentSetting(
         content_settings_type, &permissions);
 
-    if (missing_permission_count > 1)
-      continue;
-
     bool has_all_permissions = true;
     for (auto it = permissions.begin() + previous_size; it != permissions.end();
          ++it) {
       has_all_permissions &= window_android->HasPermission(*it);
     }
 
     if (!has_all_permissions) {
-      missing_permission_count++;
-      if (missing_permission_count > 1) {
-        message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
-      } else if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
-        message_id = IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT;
-      } else if (content_settings_type ==
-                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
-        message_id = IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT;
-      } else if (content_settings_type ==
-                 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
-        message_id = IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT;
+      if (message_id == -1) {
+        if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
+          message_id = IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT;
+        } else if (content_settings_type ==
+                   CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
+          message_id = IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT;
+        } else if (content_settings_type ==
+                   CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA) {
+          message_id = IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT;
+        } else {
+          CHECK(false);
+        }
+      } else if (message_id == IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT) {
+        CHECK(content_settings_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+        message_id = IDS_INFOBAR_MISSING_MICROPHONE_CAMERA_PERMISSIONS_TEXT;
+      } else if (message_id == IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT) {
+        CHECK(content_settings_type ==
+              CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
+        message_id = IDS_INFOBAR_MISSING_MICROPHONE_CAMERA_PERMISSIONS_TEXT;
       } else {
-        NOTREACHED();
-        message_id = IDS_INFOBAR_MISSING_MULTIPLE_PERMISSIONS_TEXT;
+        CHECK(false);

[raymes, 2017/05/14 23:22:24]

Are you worried about people using this to request multiple permissions in the
future or that could actually happen now?

I feel fairly confident that it couldn't happen now. I would lean toward a
DCHECK.

[benwells, 2017/05/16 15:21:30]

I don't think it can happen now. But if it somehow does I don't want bad things
to happen in builds without DCHECK (e.g. a buffer overrun). I could just return
nullptr and it might crash later with a nullptr deref, or more probably just do
nothing (i.e. permission requests would be ignored).

Hmm it's probably safest to DCHECK and otherwise keep going. I'll do that.

       }
     }
   }
 
   return PermissionUpdateInfoBarDelegate::Create(
       web_contents, permissions, message_id, callback);
 }
 
 // static
 infobars::InfoBar* PermissionUpdateInfoBarDelegate::Create(
@@ skipping 105 matching lines @@
 }
 
 bool PermissionUpdateInfoBarDelegate::Cancel() {
   base::ResetAndReturn(&callback_).Run(false);
   return true;
 }
 
 void PermissionUpdateInfoBarDelegate::InfoBarDismissed() {
   base::ResetAndReturn(&callback_).Run(false);
 }