| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "chrome/browser/extensions/activity_log/activity_log.h" | 7 #include "chrome/browser/extensions/activity_log/activity_log.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
| 10 #include "extensions/common/extension_builder.h" | 10 #include "extensions/common/extension_builder.h" |
| 11 #include "net/dns/mock_host_resolver.h" | 11 #include "net/dns/mock_host_resolver.h" |
| 12 #include "net/test/embedded_test_server/embedded_test_server.h" | 12 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 13 #include "net/test/embedded_test_server/http_request.h" | 13 #include "net/test/embedded_test_server/http_request.h" |
| 14 #include "net/test/embedded_test_server/http_response.h" | 14 #include "net/test/embedded_test_server/http_response.h" |
| 15 | 15 |
| 16 #if defined(OS_MACOSX) |
| 17 #include "base/mac/mac_util.h" |
| 18 #endif |
| 19 |
| 16 using net::test_server::BasicHttpResponse; | 20 using net::test_server::BasicHttpResponse; |
| 17 using net::test_server::HttpResponse; | 21 using net::test_server::HttpResponse; |
| 18 using net::test_server::HttpRequest; | 22 using net::test_server::HttpRequest; |
| 19 | 23 |
| 20 namespace extensions { | 24 namespace extensions { |
| 21 | 25 |
| 22 class ActivityLogApiTest : public ExtensionApiTest { | 26 class ActivityLogApiTest : public ExtensionApiTest { |
| 23 public: | 27 public: |
| 24 ActivityLogApiTest() : saved_cmdline_(base::CommandLine::NO_PROGRAM) {} | 28 ActivityLogApiTest() : saved_cmdline_(base::CommandLine::NO_PROGRAM) {} |
| 25 | 29 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 49 #if defined(OS_WIN) && !defined(NDEBUG) | 53 #if defined(OS_WIN) && !defined(NDEBUG) |
| 50 // TODO(pmarch): fix flakiness on win debug - crbug.com/299393 | 54 // TODO(pmarch): fix flakiness on win debug - crbug.com/299393 |
| 51 #define MAYBE_TriggerEvent DISABLED_TriggerEvent | 55 #define MAYBE_TriggerEvent DISABLED_TriggerEvent |
| 52 #else | 56 #else |
| 53 #define MAYBE_TriggerEvent TriggerEvent | 57 #define MAYBE_TriggerEvent TriggerEvent |
| 54 #endif | 58 #endif |
| 55 | 59 |
| 56 // The test extension sends a message to its 'friend'. The test completes | 60 // The test extension sends a message to its 'friend'. The test completes |
| 57 // if it successfully sees the 'friend' receive the message. | 61 // if it successfully sees the 'friend' receive the message. |
| 58 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) { | 62 IN_PROC_BROWSER_TEST_F(ActivityLogApiTest, MAYBE_TriggerEvent) { |
| 63 #if defined(OS_MACOSX) |
| 64 if (base::mac::IsOSSnowLeopard()) { |
| 65 // This test flakes on 10.6 only. http://crbug.com/499176 |
| 66 return; |
| 67 } |
| 68 #endif |
| 59 ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(true); | 69 ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(true); |
| 60 | 70 |
| 61 host_resolver()->AddRule("*", "127.0.0.1"); | 71 host_resolver()->AddRule("*", "127.0.0.1"); |
| 62 ASSERT_TRUE(StartEmbeddedTestServer()); | 72 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 63 embedded_test_server()->RegisterRequestHandler( | 73 embedded_test_server()->RegisterRequestHandler( |
| 64 base::Bind(&ActivityLogApiTest::HandleRequest, base::Unretained(this))); | 74 base::Bind(&ActivityLogApiTest::HandleRequest, base::Unretained(this))); |
| 65 | 75 |
| 66 const Extension* friend_extension = LoadExtensionIncognito( | 76 const Extension* friend_extension = LoadExtensionIncognito( |
| 67 test_data_dir_.AppendASCII("activity_log_private/friend")); | 77 test_data_dir_.AppendASCII("activity_log_private/friend")); |
| 68 ASSERT_TRUE(friend_extension); | 78 ASSERT_TRUE(friend_extension); |
| 69 ASSERT_TRUE(RunExtensionTest("activity_log_private/test")); | 79 ASSERT_TRUE(RunExtensionTest("activity_log_private/test")); |
| 70 ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(false); | 80 ActivityLog::GetInstance(profile())->SetWatchdogAppActiveForTesting(false); |
| 71 } | 81 } |
| 72 | 82 |
| 73 } // namespace extensions | 83 } // namespace extensions |
| 74 | 84 |
| OLD | NEW |