Index: chrome/browser/extensions/extension_browsertest.cc |
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc |
index 78287e06634ca3aa83392354fbdd085b13d72a61..12e0c5371177a9e213099ed3fa249a9eb9f812cd 100644 |
--- a/chrome/browser/extensions/extension_browsertest.cc |
+++ b/chrome/browser/extensions/extension_browsertest.cc |
@@ -31,6 +31,7 @@ |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_window.h" |
#include "chrome/browser/ui/extensions/application_launch.h" |
+#include "chrome/browser/ui/extensions/extension_message_bubble_factory.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/chrome_switches.h" |
@@ -122,6 +123,10 @@ void ExtensionBrowserTest::SetUpCommandLine(base::CommandLine* command_line) { |
test_data_dir_ = test_data_dir_.AppendASCII("extensions"); |
observer_.reset(new ExtensionTestNotificationObserver(browser())); |
+ // We don't want any warning bubbles for, e.g., unpacked extensions. |
+ ExtensionMessageBubbleFactory::set_override_for_tests( |
+ ExtensionMessageBubbleFactory::OVERRIDE_DISABLED); |
+ |
#if defined(OS_CHROMEOS) |
if (set_chromeos_user_) { |
// This makes sure that we create the Default profile first, with no |
@@ -143,6 +148,12 @@ void ExtensionBrowserTest::SetUpOnMainThread() { |
} |
} |
+void ExtensionBrowserTest::TearDownOnMainThread() { |
+ ExtensionMessageBubbleFactory::set_override_for_tests( |
+ ExtensionMessageBubbleFactory::NO_OVERRIDE); |
+ InProcessBrowserTest::TearDownOnMainThread(); |
+} |
+ |
const Extension* ExtensionBrowserTest::LoadExtension( |
const base::FilePath& path) { |
return LoadExtensionWithFlags(path, kFlagEnableFileAccess); |