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

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

Issue 1181643002: Disable ActivityLogApiTest.TriggerEvent on Mac OSX 10.6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | no next file » | 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 126ce549068c3caf24f7c99d092a34df37fdda75..351e9ae4601d02a719c436e807c8ac543d6e9887 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
@@ -13,6 +13,10 @@
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif
+
using net::test_server::BasicHttpResponse;
using net::test_server::HttpResponse;
using net::test_server::HttpRequest;
@@ -56,6 +60,12 @@ class ActivityLogApiTest : public ExtensionApiTest {
// 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) {
+#if defined(OS_MACOSX)
+ if (base::mac::IsOSSnowLeopard()) {
+ // This test flakes on 10.6 only. http://crbug.com/499176
+ return;
+ }
+#endif
ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(true);
host_resolver()->AddRule("*", "127.0.0.1");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698