Revert 147045 - Bring up a content settings icon for ungestured registerProtocolHandler call.

chrome/browser/ui/webui/options2/content_settings_handler.cc

Index: chrome/browser/ui/webui/options2/content_settings_handler.cc
===================================================================
--- chrome/browser/ui/webui/options2/content_settings_handler.cc	(revision 147078)
+++ chrome/browser/ui/webui/options2/content_settings_handler.cc	(working copy)
@@ -340,7 +340,6 @@
   {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
   {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
   {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"},
-  {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"},
   {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
   {CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream"},
 };
@@ -658,9 +657,6 @@
     // for this content type and we skip it here.
     if (type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE)
       continue;
-    // The RPH settings are retrieved separately.
-    if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)
-      continue;
     UpdateExceptionsViewFromModel(ExContentSettingsType(type));
   }
 }
@@ -691,10 +687,6 @@
     case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
       // We don't yet support exceptions for mixed scripting.
       break;
-    case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
-      break;
-    case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
-      break;
     default:
       UpdateExceptionsViewFromHostContentSettingsMap(
           type.ToContentSettingsType());