[Extenisons UI] Remove extension_action_redesign logic from the toolbar

chrome/browser/ui/extensions/extension_message_bubble_bridge.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_bridge.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
@@ skipping 34 matching lines @@
       anchored_to_action, controller_->GetExtensionIdList().size());
 }
 
 base::string16 ExtensionMessageBubbleBridge::GetItemListText() {
   return controller_->GetExtensionListForDisplay();
 }
 
 base::string16 ExtensionMessageBubbleBridge::GetActionButtonText() {
   const extensions::ExtensionIdList& list = controller_->GetExtensionIdList();
   DCHECK(!list.empty());
+  // Normally, the extension is enabled, but this might not be the case (such as
+  // for the SuspiciousExtensionBubbleDelegate, which warns the user about
+  // disabled extensions).
   const extensions::Extension* extension =
       extensions::ExtensionRegistry::Get(controller_->profile())
-          ->enabled_extensions()
-          .GetByID(list[0]);
+          ->GetExtensionById(list[0],
+                             extensions::ExtensionRegistry::EVERYTHING);
 
   DCHECK(extension);
   // An empty string is returned so that we don't display the button prompting
   // to remove policy-installed extensions.
   if (IsPolicyIndicationNeeded(extension))
     return base::string16();
   return controller_->delegate()->GetActionButtonLabel();
 }
 
 base::string16 ExtensionMessageBubbleBridge::GetDismissButtonText() {
@@ skipping 52 matching lines @@
     extra_view_info->text =
         l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN);
     extra_view_info->is_text_linked = false;
   } else {
     extra_view_info->text = controller_->delegate()->GetLearnMoreLabel();
     extra_view_info->is_text_linked = true;
   }
 
   return extra_view_info;
 }