[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc

 // Copyright 2015 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/ui/extensions/extension_message_bubble_browsertest.h"
 
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 106 matching lines @@
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToAppMenu() {
   scoped_refptr<const extensions::Extension> no_action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "no_action_extension",
           extensions::extension_action_test_util::NO_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(no_action_extension.get());
+  extension_service()->DisableExtension(
+      no_action_extension->id(), extensions::Extension::DISABLE_NOT_VERIFIED);

[Finnur, 2017/05/30 13:26:15]

It is not immediately obvious why this (and below) is related to removing the
last remnants of this toolbar-redesign-flag....

[Devlin, 2017/05/30 22:33:31]

Good point!  The reason is that, now that all extensions have actions, very few
bubbles still anchor to the app menu.  The suspicious extension bubble (warning
users about extensions that were disabled for not being from the webstore) is
one of the ones that does, so we trigger that one instead of the dev mode
bubble.

I've added comments to document this.

   Browser* second_browser = new Browser(Browser::CreateParams(profile(), true));
   ASSERT_TRUE(second_browser);
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_APP_MENU, false);
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::
     TestBubbleAnchoredToAppMenuWithOtherAction() {
   scoped_refptr<const extensions::Extension> no_action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "no_action_extension",
           extensions::extension_action_test_util::NO_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(no_action_extension.get());
 
   scoped_refptr<const extensions::Extension> action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "action_extension",
           extensions::extension_action_test_util::BROWSER_ACTION,
           extensions::Manifest::INTERNAL);
   extension_service()->AddExtension(action_extension.get());
 
+  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();
   base::RunLoop().RunUntilIdle();
 
   CheckBubble(second_browser, ANCHOR_APP_MENU, false);
   CloseBubble(second_browser);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestUninstallDangerousExtension() {
@@ skipping 217 matching lines @@
   second_browser->window()->Show();
   base::RunLoop().RunUntilIdle();
   CheckBubble(second_browser, ANCHOR_BROWSER_ACTION, true);
   ClickDismissButton(second_browser);
   base::RunLoop().RunUntilIdle();
   CheckBubbleIsNotPresent(browser(), false, false);
   // Clicking dismiss should have no affect, so the extension should still be
   // active.
   EXPECT_TRUE(registry->enabled_extensions().GetByID(id));
 }