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

Unified Diff: chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc

Issue 393583002: Enabling ActivityLogApiTest.TriggerEvent after Activity Log refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bug ownership 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
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/activity_log_private/test/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
index 7e7117f3de143faf898fdc5fb3aa6ec95e7bf586..463f3836963805e23c47bbffbb7c0744e9ba59ce 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
@@ -46,11 +46,16 @@ class ActivityLogApiTest : public ExtensionApiTest {
CommandLine saved_cmdline_;
};
+#if defined(OS_WIN) && !defined(NDEBUG)
+// TODO(pmarch): fix flakiness on win debug - crbug.com/299393
+#define MAYBE_TriggerEvent DISABLED_TriggerEvent
+#else
+#define MAYBE_TriggerEvent TriggerEvent
+#endif
+
// The test extension sends a message to its 'friend'. The test completes
// if it successfully sees the 'friend' receive the message.
-// TODO(pmarch): Enable this test once modifications to Blink are done,
-// crbug.com/388287.
-IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, DISABLED_TriggerEvent) {
+IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(true);
host_resolver()->AddRule("*", "127.0.0.1");
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/activity_log_private/test/test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698