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

chrome/common/extensions/api/extension_action/script_badge_manifest_unittest.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/api/extension_action/action_info.h"
 #include "chrome/common/extensions/extension_builder.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "extensions/common/install_warning.h"
+#include "extensions/common/manifest_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
 namespace {
 
 std::vector<InstallWarning> StripMissingFlagWarning(
@@ skipping 68 matching lines @@
                         .Set("default_title", "Other Extension")
                         .Set("default_icon", "malicious.png")))
       .Build());
   ASSERT_TRUE(extension.get());
   const ActionInfo* script_badge_info =
       ActionInfo::GetScriptBadgeInfo(extension.get());
   ASSERT_TRUE(script_badge_info);
 
   EXPECT_THAT(StripMissingFlagWarning(extension->install_warnings()),
               testing::ElementsAre(
-                  InstallWarning(InstallWarning::FORMAT_TEXT,
-                                 errors::kScriptBadgeTitleIgnored),
-                  InstallWarning(InstallWarning::FORMAT_TEXT,
-                                 errors::kScriptBadgeIconIgnored)));
+                  InstallWarning(errors::kScriptBadgeTitleIgnored,
+                                 manifest_keys::kScriptBadge),
+                  InstallWarning(errors::kScriptBadgeIconIgnored,
+                                 manifest_keys::kScriptBadge)));
 
   const ExtensionIconSet& default_icon =
       script_badge_info->default_icon;
   ASSERT_FALSE(default_icon.empty());
 
   EXPECT_EQ(1u, default_icon.map().size());
   EXPECT_EQ("icon16.png",
             default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,
                              ExtensionIconSet::MATCH_EXACTLY));
 
@@ skipping 25 matching lines @@
   EXPECT_EQ(2u, default_icon.map().size());
   EXPECT_EQ("icon128.png",
             default_icon.Get(extension_misc::EXTENSION_ICON_BITTY,
                              ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("icon128.png",
             default_icon.Get(2 * extension_misc::EXTENSION_ICON_BITTY,
                              ExtensionIconSet::MATCH_EXACTLY));
 }
 
 }  // namespace extensions