| Index: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
|
| index d71f40e227dd95fb781f7a4b19de8ef64dbd1ec9..55330dab56e37919bca4a9e82b766f50cb84a78e 100644
|
| --- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
|
| @@ -841,7 +841,8 @@ void SetInstallTime(const std::string& extension_id,
|
|
|
| // The feature this is meant to test is only implemented on Windows.
|
| #if defined(OS_WIN)
|
| -#define MAYBE_ProxyOverriddenControllerTest ProxyOverriddenControllerTest
|
| +// http://crbug.com/397426
|
| +#define MAYBE_ProxyOverriddenControllerTest DISABLED_ProxyOverriddenControllerTest
|
| #else
|
| #define MAYBE_ProxyOverriddenControllerTest DISABLED_ProxyOverriddenControllerTest
|
| #endif
|
|
|