[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc

Index: chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
index 99d3ae16d5e4461cb8a854375eea27c0f8da0351..f2557f4d873407c2e245daa0524177c41b3bab00 100644
--- a/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
+++ b/chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc
@@ -122,8 +122,14 @@ void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToAppMenu() {
       extensions::extension_action_test_util::CreateActionExtension(
           "no_action_extension",
           extensions::extension_action_test_util::NO_ACTION,
-          extensions::Manifest::UNPACKED);
+          extensions::Manifest::INTERNAL);
   extension_service()->AddExtension(no_action_extension.get());
+  // The 'suspicious extension' bubble warns the user about extensions that are
+  // disabled for not being from the webstore. This is one of the few bubbles
+  // that lets us test anchoring to the app menu, since we usually anchor to the
+  // extension action now that every extension is given a permanent UI presence.
+  extension_service()->DisableExtension(
+      no_action_extension->id(), extensions::Extension::DISABLE_NOT_VERIFIED);
   Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
@@ -138,7 +144,7 @@ void ExtensionMessageBubbleBrowserTest::
       extensions::extension_action_test_util::CreateActionExtension(
           "no_action_extension",
           extensions::extension_action_test_util::NO_ACTION,
-          extensions::Manifest::UNPACKED);
+          extensions::Manifest::INTERNAL);
   extension_service()->AddExtension(no_action_extension.get());
 
   scoped_refptr<const extensions::Extension> action_extension =
@@ -148,6 +154,13 @@ void ExtensionMessageBubbleBrowserTest::
           extensions::Manifest::INTERNAL);
   extension_service()->AddExtension(action_extension.get());
 
+  // The 'suspicious extension' bubble warns the user about extensions that are
+  // disabled for not being from the webstore. This is one of the few bubbles
+  // that lets us test anchoring to the app menu, since we usually anchor to the
+  // extension action now that every extension is given a permanent UI presence.
+  extension_service()->DisableExtension(
+      no_action_extension->id(), extensions::Extension::DISABLE_NOT_VERIFIED);
+
   Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();