Change manifest handler interface to always (implicitly) pass the entire manifest to handlers.

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/api/extension_action/script_badge_handler.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_handler.h"
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.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<Extension::InstallWarning> StripMissingFlagWarning(
     const std::vector<Extension::InstallWarning>& install_warnings) {
   std::vector<Extension::InstallWarning> result;
   for (size_t i = 0; i < install_warnings.size(); ++i) {
     if (install_warnings[i].message != errors::kScriptBadgeRequiresFlag)
       result.push_back(install_warnings[i]);
   }
   return result;
 }
 
 class ScriptBadgeManifestTest : public ExtensionManifestTest {
  protected:
+  ScriptBadgeManifestTest()
+    : enable_script_badges_(FeatureSwitch::script_badges(), true) {
+  }
+
   virtual void SetUp() OVERRIDE {
     ManifestHandler::Register(extension_manifest_keys::kScriptBadge,
                               new ScriptBadgeHandler);
   }
+ private:
+  FeatureSwitch::ScopedOverride enable_script_badges_;
 };
 
 }  // namespace
 
 TEST_F(ScriptBadgeManifestTest, ScriptBadgeBasic) {
   scoped_refptr<Extension> extension(
       ExtensionBuilder()
       .SetManifest(DictionaryBuilder()
                    .Set("manifest_version", 2)
                    .Set("name", "my extension")
@@ skipping 99 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