Reinstate evil hack to suppress permission warnings for searchProvider

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

 // Copyright 2013 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/common/extensions/permissions/chrome_permission_message_provider.h"
 
 #include <vector>
 
 #include "base/metrics/field_trial.h"
 #include "base/stl_util.h"
@@ skipping 26 matching lines @@
     if (msg_->message() > rhs.msg_->message())
       return false;
     return msg_->submessages() < rhs.msg_->submessages();
   }
 
  private:
   const PermissionMessage* msg_;
 };
 using ComparablePermissions = std::vector<ComparablePermission>;
 
+void DropPermissionParameter(APIPermission::ID id,
+                             PermissionIDSet* permissions) {
+  if (permissions->ContainsID(id)) {
+    // Erase the permission, and insert it again without a parameter.
+    permissions->erase(id);
+    permissions->insert(id);
+  }
+}
+
 }  // namespace
 
 typedef std::set<PermissionMessage> PermissionMsgSet;
 
 ChromePermissionMessageProvider::ChromePermissionMessageProvider() {
 }
 
 ChromePermissionMessageProvider::~ChromePermissionMessageProvider() {
 }
 
@@ skipping 112 matching lines @@
 bool ChromePermissionMessageProvider::IsAPIOrManifestPrivilegeIncrease(
     const PermissionSet& old_permissions,
     const PermissionSet& new_permissions) const {
   PermissionIDSet old_ids;
   AddAPIPermissions(old_permissions, &old_ids);
   AddManifestPermissions(old_permissions, &old_ids);
   PermissionIDSet new_ids;
   AddAPIPermissions(new_permissions, &new_ids);
   AddManifestPermissions(new_permissions, &new_ids);
 
+  // Ugly hack: Before M46 beta, we didn't store the parameter for settings
+  // override permissions in prefs (which is where |old_permissions| is coming
+  // from). To avoid a spurious permission increase warning, drop the parameter.
+  // See crbug.com/533086 and crbug.com/619759.
+  // TODO(treib,devlin): Remove this for M56, when hopefully all users will have
+  // updated prefs.
+  const APIPermission::ID kSettingsOverrideIDs[] = {
+      APIPermission::kHomepage, APIPermission::kSearchProvider,
+      APIPermission::kStartupPages};
+  for (auto id : kSettingsOverrideIDs) {
+    DropPermissionParameter(id, &old_ids);
+    DropPermissionParameter(id, &new_ids);
+  }
+
   // If all the IDs were already there, it's not a privilege increase.
   if (old_ids.Includes(new_ids))
     return false;
 
   // Otherwise, check the actual messages - not all IDs result in a message,
   // and some messages can suppress others.
   PermissionMessages old_messages = GetPermissionMessages(old_ids);
   PermissionMessages new_messages = GetPermissionMessages(new_ids);
 
   ComparablePermissions old_strings(old_messages.begin(), old_messages.end());
@@ skipping 34 matching lines @@
   std::set<std::string> old_hosts_set(
       permission_message_util::GetDistinctHosts(old_list, false, false));
   std::set<std::string> new_hosts_only =
       base::STLSetDifference<std::set<std::string> >(new_hosts_set,
                                                      old_hosts_set);
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions