Add a "key" entry to InstallWarnings, remove InstallWarning::Format

chrome/common/extensions/permissions/permissions_data.cc

 // Copyright (c) 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/permissions_data.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 139 matching lines @@
     Feature::Availability availability = feature->IsAvailableToManifest(
         extension->id(),
         extension->GetType(),
         Feature::ConvertLocation(extension->location()),
         extension->manifest_version());
 
     if (!availability.is_available()) {
       // Don't fail, but warn the developer that the manifest contains
       // unrecognized permissions. This may happen legitimately if the
       // extensions requests platform- or channel-specific permissions.
-      extension->AddInstallWarning(InstallWarning(InstallWarning::FORMAT_TEXT,
-                                                  availability.message()));
+      extension->AddInstallWarning(InstallWarning(availability.message(),
+                                                  feature->name()));
       to_remove.push_back(iter->id());
       continue;
     }
 
     if (iter->id() == APIPermission::kExperimental) {
       if (!CanSpecifyExperimentalPermission(extension)) {
         *error = ASCIIToUTF16(errors::kExperimentalFlagRequired);
         return false;
       }
     }
@@ skipping 52 matching lines @@
       // chrome://thumbnail, so add them back in to host_permissions separately.
       if (pattern.match_all_urls())
         host_permissions->AddPatterns(GetPermittedChromeSchemeHosts(
             extension, *api_permissions));
       continue;
     }
 
     // It's probably an unknown API permission. Do not throw an error so
     // extensions can retain backwards compatability (http://crbug.com/42742).
     extension->AddInstallWarning(InstallWarning(
-        InstallWarning::FORMAT_TEXT,
-        base::StringPrintf(
+       base::StringPrintf(
             "Permission '%s' is unknown or URL pattern is malformed.",
-            permission_str.c_str())));
+            permission_str.c_str()),
+        key,
+        permission_str));
   }
 
   return true;
 }
 
 // Returns true if this extension id is from a trusted provider.
 bool IsTrustedId(const std::string& extension_id) {
   // See http://b/4946060 for more details.
   return extension_id == std::string("nckgahadagoaajjgafhacjanaoiihapd");
 }
@@ skipping 386 matching lines @@
   optional_permission_set_ = new PermissionSet(
       initial_optional_permissions_->api_permissions,
       initial_optional_permissions_->host_permissions,
       URLPatternSet());
 
   initial_required_permissions_.reset();
   initial_optional_permissions_.reset();
 }
 
 }  // namespace extensions