[Extensions] Remove old permissions hack

Bug: 845538
Change-Id: Ifd14042d52f1a8ead55a6ee919618a801dbf7049
Reviewed-on: https://chromium-review.googlesource.com/1091227Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565757}

chrome/browser/extensions/extension_install_prompt.cc

@@ -678,10 +678,7 @@ void ExtensionInstallPrompt::ShowConfirmation() {
     }
   }
 
-  if (permissions_to_display &&
-      (!extension_ ||
-       !extensions::PermissionsData::ShouldSkipPermissionWarnings(
-           extension_->id()))) {
+  if (permissions_to_display) {
     Manifest::Type type =
         extension_ ? extension_->GetType() : Manifest::TYPE_UNKNOWN;
     const extensions::PermissionMessageProvider* message_provider =

extensions/common/permissions/permissions_data.cc

@@ -85,13 +85,6 @@ bool PermissionsData::CanExecuteScriptEverywhere(
   return base::ContainsValue(whitelist, extension_id);
 }
 
-// static
-bool PermissionsData::ShouldSkipPermissionWarnings(
-    const std::string& extension_id) {
-  // See http://b/4946060 for more details.
-  return extension_id == extension_misc::kProdHangoutsExtensionId;
-}
-
 bool PermissionsData::IsRestrictedUrl(const GURL& document_url,
                                       std::string* error) const {
   if (CanExecuteScriptEverywhere(extension_id_, location_))

extensions/common/permissions/permissions_data.h

@@ -77,10 +77,6 @@ class PermissionsData {
   static bool CanExecuteScriptEverywhere(const ExtensionId& extension_id,
                                          Manifest::Location location);
 
-  // Returns true if we should skip the permissions warning for the extension
-  // with the given |extension_id|.
-  static bool ShouldSkipPermissionWarnings(const std::string& extension_id);
-
   // Returns true if the given |url| is restricted for the given |extension|,
   // as is commonly the case for chrome:// urls.
   // NOTE: You probably want to use CanAccessPage().