Revert of [Extensions Toolbar] Add a finch config for the redesign

chrome/browser/extensions/extension_action.cc

Index: chrome/browser/extensions/extension_action.cc
diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc
index c6033e53f8fb2f48bf8ddb7643f433af4945d6ed..af9e8685934c872f5e0e5b4aa3cdab328156bc93 100644
--- a/chrome/browser/extensions/extension_action.cc
+++ b/chrome/browser/extensions/extension_action.cc
@@ -256,20 +256,15 @@
   if (default_icon_image_)
     return default_icon_image_->image();
 
-  if (placeholder_icon_image_.IsEmpty()) {
-    // If the extension action redesign is enabled, we use a special placeholder
-    // icon (with the first letter of the extension name) rather than the
-    // default (puzzle piece).
-    if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
-      placeholder_icon_image_ =
-          extensions::ExtensionIconPlaceholder::CreateImage(
-              extension_misc::EXTENSION_ICON_ACTION, extension_name_);
-    } else {
-      placeholder_icon_image_ = GetDefaultIcon();
-    }
-  }
-
-  return placeholder_icon_image_;
+  // If the extension action redesign is enabled, we use a special placeholder
+  // icon (with the first letter of the extension name) rather than the default
+  // (puzzle piece).
+  if (extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()) {
+    return extensions::ExtensionIconPlaceholder::CreateImage(
+        extension_misc::EXTENSION_ICON_ACTION, extension_name_);
+  }
+
+  return GetDefaultIcon();
 }
 
 bool ExtensionAction::HasPopupUrl(int tab_id) const {