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"); |