| Index: chrome/browser/component_updater/test/component_updater_service_unittest.cc
|
| diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc
|
| index c05fe7b0cd35bf3a9d92754a07cacba2eca0dcad..bb9aa36bc440c61aa72ac5388113edffe0d42395 100644
|
| --- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc
|
| +++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc
|
| @@ -460,7 +460,13 @@ TEST_F(ComponentUpdaterTest, ProdVersionCheck) {
|
| // nothing happens.
|
| // - We make an on demand call.
|
| // - This triggers a second loop, which has a reply that triggers an install.
|
| -TEST_F(ComponentUpdaterTest, OnDemandUpdate) {
|
| +#if defined(OS_LINUX)
|
| +// http://crbug.com/396488
|
| +#define MAYBE_OnDemandUpdate DISABLED_OnDemandUpdate
|
| +#else
|
| +#define MAYBE_OnDemandUpdate OnDemandUpdate
|
| +#endif
|
| +TEST_F(ComponentUpdaterTest, MAYBE_OnDemandUpdate) {
|
| MockServiceObserver observer;
|
| {
|
| InSequence seq;
|
|
|