| 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 "chrome/browser/feedback/feedback_uploader.h" | 5 #include "chrome/browser/feedback/feedback_uploader.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 content::TestBrowserThread ui_thread_; | 99 content::TestBrowserThread ui_thread_; |
| 100 scoped_ptr<TestingProfile> profile_; | 100 scoped_ptr<TestingProfile> profile_; |
| 101 | 101 |
| 102 FeedbackUploader* uploader_; | 102 FeedbackUploader* uploader_; |
| 103 | 103 |
| 104 std::map<std::string, unsigned int> dispatched_reports_; | 104 std::map<std::string, unsigned int> dispatched_reports_; |
| 105 size_t dispatched_reports_count_; | 105 size_t dispatched_reports_count_; |
| 106 size_t expected_reports_; | 106 size_t expected_reports_; |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MACOSX) | 109 #if defined(OS_LINUX) || defined(OS_MACOSX) |
| 110 #define MAYBE_QueueMultiple QueueMultiple | 110 #define MAYBE_QueueMultiple QueueMultiple |
| 111 #else | 111 #else |
| 112 // crbug.com/330547 | 112 // crbug.com/330547 |
| 113 #define MAYBE_QueueMultiple DISABLED_QueueMultiple | 113 #define MAYBE_QueueMultiple DISABLED_QueueMultiple |
| 114 #endif | 114 #endif |
| 115 TEST_F(FeedbackUploaderTest, MAYBE_QueueMultiple) { | 115 TEST_F(FeedbackUploaderTest, MAYBE_QueueMultiple) { |
| 116 dispatched_reports_.clear(); | 116 dispatched_reports_.clear(); |
| 117 QueueReport(kReportOne); | 117 QueueReport(kReportOne); |
| 118 QueueReport(kReportTwo); | 118 QueueReport(kReportTwo); |
| 119 QueueReport(kReportThree); | 119 QueueReport(kReportThree); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 149 | 149 |
| 150 EXPECT_EQ(dispatched_reports_.size(), 5u); | 150 EXPECT_EQ(dispatched_reports_.size(), 5u); |
| 151 EXPECT_EQ(dispatched_reports_[kReportOne], 1u); | 151 EXPECT_EQ(dispatched_reports_[kReportOne], 1u); |
| 152 EXPECT_EQ(dispatched_reports_[kReportTwo], 2u); | 152 EXPECT_EQ(dispatched_reports_[kReportTwo], 2u); |
| 153 EXPECT_EQ(dispatched_reports_[kReportThree], 2u); | 153 EXPECT_EQ(dispatched_reports_[kReportThree], 2u); |
| 154 EXPECT_EQ(dispatched_reports_[kReportFour], 1u); | 154 EXPECT_EQ(dispatched_reports_[kReportFour], 1u); |
| 155 EXPECT_EQ(dispatched_reports_[kReportFive], 1u); | 155 EXPECT_EQ(dispatched_reports_[kReportFive], 1u); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace feedback | 158 } // namespace feedback |
| OLD | NEW |