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

chrome/common/extensions/manifest.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/common/extensions/manifest.h"
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
@@ skipping 139 matching lines @@
        feature_name != feature_names.end(); ++feature_name) {
     // Use Get instead of HasKey because the former uses path expansion.
     if (!value_->Get(*feature_name, NULL))
       continue;
 
     Feature* feature = provider->GetFeature(*feature_name);
     Feature::Availability result = feature->IsAvailableToManifest(
         extension_id_, type_, Feature::ConvertLocation(location_),
         GetManifestVersion());
     if (!result.is_available())
-      warnings->push_back(InstallWarning(
-          InstallWarning::FORMAT_TEXT, result.message()));
+      warnings->push_back(InstallWarning(result.message(), *feature_name));
   }
 
   // Also generate warnings for keys that are not features.
   for (base::DictionaryValue::Iterator it(*value_); !it.IsAtEnd();
        it.Advance()) {
     if (!provider->GetFeature(it.key())) {
       warnings->push_back(InstallWarning(
-          InstallWarning::FORMAT_TEXT,
           base::StringPrintf("Unrecognized manifest key '%s'.",
-                             it.key().c_str())));
+                             it.key().c_str()),
+          it.key()));
     }
   }
   return true;
 }
 
 bool Manifest::HasKey(const std::string& key) const {
   return CanAccessKey(key) && value_->HasKey(key);
 }
 
 bool Manifest::HasPath(const std::string& path) const {
@@ skipping 72 matching lines @@
   Feature* feature = FeatureProvider::GetByName("manifest")->GetFeature(key);
   if (!feature)
     return true;
 
   return feature->IsAvailableToManifest(
       extension_id_, type_, Feature::ConvertLocation(location_),
       GetManifestVersion()).is_available();
 }
 
 }  // namespace extensions