Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1253)

Unified Diff: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

Issue 421193002: Fix ExtensionServiceTest.ClearExtensionData flakiness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use base::DoNothing for empty callbacks Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 55330dab56e37919bca4a9e82b766f50cb84a78e..cc3287774c8ebc210216de572b71e06c8d56af8a 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -720,12 +720,18 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId3));
// Clean up after ourselves.
- service_->UninstallExtension(
- kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
- service_->UninstallExtension(
- kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
- service_->UninstallExtension(
- kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+ service_->UninstallExtension(kId1,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
+ service_->UninstallExtension(kId2,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
+ service_->UninstallExtension(kId3,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
}
}
@@ -822,12 +828,18 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_NtpOverriddenControllerTest) {
EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId3));
// Clean up after ourselves.
- service_->UninstallExtension(
- kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
- service_->UninstallExtension(
- kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
- service_->UninstallExtension(
- kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+ service_->UninstallExtension(kId1,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
+ service_->UninstallExtension(kId2,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
+ service_->UninstallExtension(kId3,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
}
void SetInstallTime(const std::string& extension_id,
@@ -946,12 +958,18 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) {
EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3));
// Clean up after ourselves.
- service_->UninstallExtension(
- kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
- service_->UninstallExtension(
- kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
- service_->UninstallExtension(
- kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+ service_->UninstallExtension(kId1,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
+ service_->UninstallExtension(kId2,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
+ service_->UninstallExtension(kId3,
+ extensions::UNINSTALL_REASON_FOR_TESTING,
+ base::Bind(&base::DoNothing),
+ NULL);
}
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/extension_gcm_app_handler_unittest.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698