[Extensions] Remove usage of extension_action_redesign in declarativeContent

chrome/browser/extensions/api/declarative_content/content_action_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/browser/extensions/api/declarative_content/content_action.h"
 
 #include <stdint.h>
 
 #include "base/base64.h"
 #include "base/run_loop.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
-#include "extensions/common/feature_switch.h"
 #include "extensions/common/value_builder.h"
 #include "ipc/ipc_message_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
 
 namespace extensions {
 namespace {
@@ skipping 56 matching lines @@
   result = ContentAction::Create(NULL, NULL, *ParseJson(
       "{\n"
       "  \"instanceType\": \"declarativeContent.UnknownType\",\n"
       "}"),
                                  &error);
   EXPECT_THAT(error, HasSubstr("invalid instanceType"));
   EXPECT_FALSE(result.get());
 }
 
 TEST(DeclarativeContentActionTest, ShowPageActionWithoutPageAction) {
-  // Tests legacy behavior.
-  FeatureSwitch::ScopedOverride action_redesign_override(
-      FeatureSwitch::extension_action_redesign(), false);
   TestExtensionEnvironment env;
 
-  const Extension* extension = env.MakeExtension(base::DictionaryValue());
+  // We install a component extension because all other extensions have a
+  // required action.
+  DictionaryBuilder manifest;
+  manifest.Set("name", "extension")
+      .Set("version", "0.1")
+      .Set("manifest_version", 2)
+      .Set("description", "an extension");
+  scoped_refptr<const Extension> extension =
+      ExtensionBuilder()
+          .SetManifest(manifest.Build())
+          .SetLocation(Manifest::COMPONENT)
+          .Build();
+  env.GetExtensionService()->AddExtension(extension.get());
+
   std::string error;
   std::unique_ptr<const ContentAction> result = ContentAction::Create(
-      NULL, extension,
+      NULL, extension.get(),
       *ParseJson("{\n"
                  "  \"instanceType\": \"declarativeContent.ShowPageAction\",\n"
                  "}"),
       &error);
   EXPECT_THAT(error, testing::HasSubstr("without a page action"));
   ASSERT_FALSE(result.get());
 }
 
 TEST(DeclarativeContentActionTest, ShowPageAction) {
   TestExtensionEnvironment env;
@@ skipping 207 matching lines @@
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
           "  \"js\": [\"script.js\"],\n"
           "  \"matchAboutBlank\": null\n"
           "}"),
       &error);
   ASSERT_FALSE(result.get());
 }
 
 }  // namespace
 }  // namespace extensions