[Extensions] Expand testing overrides for extension warning bubbles

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/run_loop.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
 #include "extensions/common/feature_switch.h"
 
 ExtensionMessageBubbleBrowserTest::ExtensionMessageBubbleBrowserTest() {
 }
 
 ExtensionMessageBubbleBrowserTest::~ExtensionMessageBubbleBrowserTest() {
 }
 
 void ExtensionMessageBubbleBrowserTest::SetUpCommandLine(
     base::CommandLine* command_line) {
   BrowserActionsBarBrowserTest::SetUpCommandLine(command_line);
   // The dev mode warning bubble is an easy one to trigger, so we use that for
   // our testing purposes.
   dev_mode_bubble_override_.reset(
       new extensions::FeatureSwitch::ScopedOverride(
           extensions::FeatureSwitch::force_dev_mode_highlighting(),
           true));
-  ExtensionMessageBubbleFactory::set_enabled_for_tests(true);
+  ExtensionMessageBubbleFactory::set_override_for_tests(
+      ExtensionMessageBubbleFactory::OVERRIDE_ENABLED);
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToExtensionAction() {
   scoped_refptr<const extensions::Extension> action_extension =
       extensions::extension_action_test_util::CreateActionExtension(
           "action_extension",
           extensions::extension_action_test_util::BROWSER_ACTION,
           extensions::Manifest::UNPACKED);
   extension_service()->AddExtension(action_extension.get());
 
@@ skipping 47 matching lines @@
 
 void ExtensionMessageBubbleBrowserTest::PreBubbleShowsOnStartup() {
   LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
 }
 
 void ExtensionMessageBubbleBrowserTest::TestBubbleShowsOnStartup() {
   base::RunLoop().RunUntilIdle();
   CheckBubble(browser(), ANCHOR_BROWSER_ACTION);
   CloseBubble(browser());
 }