chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc - Issue 23465025: [Activity Log] Enable end to end tests for Mac OS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23465025: [Activity Log] Enable end to end tests for Mac OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge with chromeos enable 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

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 2f015645e6735406df517304b78fa17a9abd6a1e..8f40dfa71ce6176b390150169f25f9d09d61e54f 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,7 +31,7 @@ class ActivityLogApiTest : public ExtensionApiTest {

CommandLine saved_cmdline_;

};

-#if defined(OS_WIN) || defined(OS_MACOSX)

+#if defined(OS_WIN)

// TODO(karenlees): test flaky on windows. See Bug: crbug.com/245594

#define MAYBE_TriggerEvent DISABLED_TriggerEvent

#else

« 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 »