[Merge to M59] Fix for broken "Load unpacked extension" popup

chrome/browser/chromeos/extensions/permissions_updater_delegate_chromeos.cc

 // Copyright 2017 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/chromeos/extensions/permissions_updater_delegate_chromeos.h"
 
 #include "chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/api_permission_set.h"
@@ skipping 14 matching lines @@
       chromeos::DeviceLocalAccountManagementPolicyProvider::IsWhitelisted(
           extension) ||
       !(*granted_permissions)
            ->HasAPIPermission(APIPermission::kClipboardRead)) {
     return;
   }
   // Revoke kClipboardRead permission (used in Public Sessions to secure
   // clipboard read functionality). This forceful removal of permission is safe
   // since the clipboard pasting code checks for this permission before doing
   // the paste (the end result is just an empty paste).
-  APIPermissionSet api_permission_set((*granted_permissions)->apis());
-  api_permission_set.erase(APIPermission::kClipboardRead);
-  granted_permissions->reset(
-      new PermissionSet(api_permission_set, ManifestPermissionSet(),
-                        URLPatternSet(), URLPatternSet()));
+  APIPermissionSet api_permission_set;
+  api_permission_set.insert(APIPermission::kClipboardRead);
+  *granted_permissions = PermissionSet::CreateDifference(
+      **granted_permissions,
+      PermissionSet(api_permission_set, ManifestPermissionSet(),
+                    URLPatternSet(), URLPatternSet()));
 }
 
 }  // namespace extensions