Revert 170514

chrome/browser/extensions/api/permissions/permissions_api.cc

 // 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.
 
 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/permissions_updater.h"
@@ skipping 151 matching lines @@
   APIPermissionSet apis = requested_permissions_->apis();
   for (APIPermissionSet::const_iterator i = apis.begin();
        i != apis.end(); ++i) {
     if (!i->info()->supports_optional()) {
       error_ = ErrorUtils::FormatErrorMessage(
           kNotWhitelistedError, i->name());
       return false;
     }
   }
 
-  // Filter out permissions that do not need to be listed in the optional
-  // section of the manifest.
-  scoped_refptr<extensions::PermissionSet>
-      manifest_required_requested_permissions =
-          PermissionSet::ExcludeNotInManifestPermissions(
-              requested_permissions_.get());
-
   // The requested permissions must be defined as optional in the manifest.
   if (!GetExtension()->optional_permission_set()->Contains(
-          *manifest_required_requested_permissions)) {
+          *requested_permissions_)) {
     error_ = kNotInOptionalPermissionsError;
     results_ = Request::Results::Create(false);
     return false;
   }
 
   // We don't need to prompt the user if the requested permissions are a subset
   // of the granted permissions set.
   scoped_refptr<const PermissionSet> granted =
       prefs->GetGrantedPermissions(GetExtension()->id());
   if (granted.get() && granted->Contains(*requested_permissions_)) {
@@ skipping 22 matching lines @@
     InstallUIAbort(true);
   } else {
     CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests);
     install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents()));
     install_ui_->ConfirmPermissions(
         this, GetExtension(), requested_permissions_.get());
   }
 
   return true;
 }