| 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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "base/version.h" | 7 #include "base/version.h" |
| 8 #include "chrome/browser/component_updater/component_updater_ping_manager.h" | 8 #include "chrome/browser/component_updater/component_updater_ping_manager.h" |
| 9 #include "chrome/browser/component_updater/crx_update_item.h" | 9 #include "chrome/browser/component_updater/crx_update_item.h" |
| 10 #include "chrome/browser/component_updater/test/component_updater_service_unitte
st.h" | 10 #include "chrome/browser/component_updater/test/component_updater_service_unitte
st.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 } | 54 } |
| 55 | 55 |
| 56 void ComponentUpdaterPingManagerTest::TearDown() { | 56 void ComponentUpdaterPingManagerTest::TearDown() { |
| 57 ping_manager_.reset(); | 57 ping_manager_.reset(); |
| 58 } | 58 } |
| 59 | 59 |
| 60 void ComponentUpdaterPingManagerTest::RunThreadsUntilIdle() { | 60 void ComponentUpdaterPingManagerTest::RunThreadsUntilIdle() { |
| 61 base::RunLoop().RunUntilIdle(); | 61 base::RunLoop().RunUntilIdle(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 TEST_F(ComponentUpdaterPingManagerTest, PingManagerTest) { | 64 // Test is flaky: http://crbug.com/349547 |
| 65 TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
| 65 scoped_ptr<InterceptorFactory> interceptor_factory(new InterceptorFactory); | 66 scoped_ptr<InterceptorFactory> interceptor_factory(new InterceptorFactory); |
| 66 URLRequestPostInterceptor* interceptor = | 67 URLRequestPostInterceptor* interceptor = |
| 67 interceptor_factory->CreateInterceptor(); | 68 interceptor_factory->CreateInterceptor(); |
| 68 EXPECT_TRUE(interceptor); | 69 EXPECT_TRUE(interceptor); |
| 69 | 70 |
| 70 // Test eventresult="1" is sent for successful updates. | 71 // Test eventresult="1" is sent for successful updates. |
| 71 CrxUpdateItem item; | 72 CrxUpdateItem item; |
| 72 item.id = "abc"; | 73 item.id = "abc"; |
| 73 item.status = CrxUpdateItem::kUpdated; | 74 item.status = CrxUpdateItem::kUpdated; |
| 74 item.previous_version = base::Version("1.0"); | 75 item.previous_version = base::Version("1.0"); |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 "total=\"456\" download_time_ms=\"987\"/>" | 169 "total=\"456\" download_time_ms=\"987\"/>" |
| 169 "<event eventtype=\"14\" eventresult=\"1\" downloader=\"bits\" " | 170 "<event eventtype=\"14\" eventresult=\"1\" downloader=\"bits\" " |
| 170 "url=\"http://host2/path2\" downloaded=\"1230\" total=\"4560\" " | 171 "url=\"http://host2/path2\" downloaded=\"1230\" total=\"4560\" " |
| 171 "download_time_ms=\"9870\"/></app>")) | 172 "download_time_ms=\"9870\"/></app>")) |
| 172 << interceptor->GetRequestsAsString(); | 173 << interceptor->GetRequestsAsString(); |
| 173 interceptor->Reset(); | 174 interceptor->Reset(); |
| 174 } | 175 } |
| 175 | 176 |
| 176 } // namespace component_updater | 177 } // namespace component_updater |
| 177 | 178 |
| OLD | NEW |