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

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

Issue 23614016: [Activity Log] Enable end to end tests on windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODOs Created 7 years, 3 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/README » ('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 8f40dfa71ce6176b390150169f25f9d09d61e54f..7b6490d54d913970d34369fcbd8bee4e11c427a9 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
@@ -31,16 +31,9 @@ class ActivityLogApiTest : public ExtensionApiTest {
CommandLine saved_cmdline_;
};
-#if defined(OS_WIN)
-// TODO(karenlees): test flaky on windows. See Bug: crbug.com/245594
-#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.
-IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) {
+IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, TriggerEvent) {
ActivityLog::GetInstance(profile())->SetWatchdogAppActive(true);
host_resolver()->AddRule("*", "127.0.0.1");
const Extension* friend_extension = LoadExtensionIncognito(
« no previous file with comments | « no previous file | chrome/test/data/extensions/api_test/activity_log_private/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698