| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "testing/gtest/include/gtest/gtest.h" | 5 #include "testing/gtest/include/gtest/gtest.h" |
| 6 | 6 |
| 7 #include "base/stl_util-inl.h" | 7 #include "base/stl_util-inl.h" |
| 8 #include "base/thread.h" | 8 #include "base/thread.h" |
| 9 #include "base/waitable_event.h" | 9 #include "base/waitable_event.h" |
| 10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
| (...skipping 3020 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3031 } | 3031 } |
| 3032 | 3032 |
| 3033 TEST_F(AppCacheUpdateJobTest, UpgradeFetchManifestFail) { | 3033 TEST_F(AppCacheUpdateJobTest, UpgradeFetchManifestFail) { |
| 3034 RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeFetchManifestFailTest); | 3034 RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeFetchManifestFailTest); |
| 3035 } | 3035 } |
| 3036 | 3036 |
| 3037 TEST_F(AppCacheUpdateJobTest, ManifestRedirect) { | 3037 TEST_F(AppCacheUpdateJobTest, ManifestRedirect) { |
| 3038 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestRedirectTest); | 3038 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestRedirectTest); |
| 3039 } | 3039 } |
| 3040 | 3040 |
| 3041 TEST_F(AppCacheUpdateJobTest, ManifestWrongMimeType) { | 3041 #if defined(OS_MACOSX) |
| 3042 // Crashing on mac webkit bots. http://crbug.com/45664 |
| 3043 #define MAYBE_ManifestWrongMimeType DISABLED_ManifestWrongMimeType |
| 3044 #else |
| 3045 #define MAYBE_ManifestWrongMimeType ManifestWrongMimeType |
| 3046 #endif |
| 3047 |
| 3048 TEST_F(AppCacheUpdateJobTest, MAYBE_ManifestWrongMimeType) { |
| 3042 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestWrongMimeTypeTest); | 3049 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestWrongMimeTypeTest); |
| 3043 } | 3050 } |
| 3044 | 3051 |
| 3045 TEST_F(AppCacheUpdateJobTest, ManifestNotFound) { | 3052 TEST_F(AppCacheUpdateJobTest, ManifestNotFound) { |
| 3046 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestNotFoundTest); | 3053 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestNotFoundTest); |
| 3047 } | 3054 } |
| 3048 | 3055 |
| 3049 TEST_F(AppCacheUpdateJobTest, ManifestGone) { | 3056 TEST_F(AppCacheUpdateJobTest, ManifestGone) { |
| 3050 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestGoneTest); | 3057 RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestGoneTest); |
| 3051 } | 3058 } |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3223 struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest> { | 3230 struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest> { |
| 3224 void RetainCallee(appcache::AppCacheUpdateJobTest* obj) { } | 3231 void RetainCallee(appcache::AppCacheUpdateJobTest* obj) { } |
| 3225 void ReleaseCallee(appcache::AppCacheUpdateJobTest* obj) { } | 3232 void ReleaseCallee(appcache::AppCacheUpdateJobTest* obj) { } |
| 3226 }; | 3233 }; |
| 3227 template<> | 3234 template<> |
| 3228 struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest::MockAppCachePolicy> | 3235 struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest::MockAppCachePolicy> |
| 3229 { | 3236 { |
| 3230 void RetainCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { } | 3237 void RetainCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { } |
| 3231 void ReleaseCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { } | 3238 void ReleaseCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { } |
| 3232 }; | 3239 }; |
| OLD | NEW |