Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Side by Side Diff: components/gcm_driver/gcm_account_mapper_unittest.cc

Issue 1809093002: Remove unnecessary overrides from CustomFakeGCMDriver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/gcm_driver/gcm_account_mapper.h" 5 #include "components/gcm_driver/gcm_account_mapper.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/test/simple_test_clock.h" 10 #include "base/test/simple_test_clock.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 SEND_FINISHED, 87 SEND_FINISHED,
88 SEND_ACKNOWLEDGED 88 SEND_ACKNOWLEDGED
89 }; 89 };
90 90
91 CustomFakeGCMDriver(); 91 CustomFakeGCMDriver();
92 ~CustomFakeGCMDriver() override; 92 ~CustomFakeGCMDriver() override;
93 93
94 // GCMDriver implementation: 94 // GCMDriver implementation:
95 void UpdateAccountMapping(const AccountMapping& account_mapping) override; 95 void UpdateAccountMapping(const AccountMapping& account_mapping) override;
96 void RemoveAccountMapping(const std::string& account_id) override; 96 void RemoveAccountMapping(const std::string& account_id) override;
97 void AddAppHandler(const std::string& app_id,
98 GCMAppHandler* handler) override;
99 void RemoveAppHandler(const std::string& app_id) override;
100 void RegisterImpl(const std::string& app_id, 97 void RegisterImpl(const std::string& app_id,
101 const std::vector<std::string>& sender_ids) override; 98 const std::vector<std::string>& sender_ids) override;
102 99
103 void CompleteRegister(const std::string& registration_id, 100 void CompleteRegister(const std::string& registration_id,
104 GCMClient::Result result); 101 GCMClient::Result result);
105 void CompleteSend(const std::string& message_id, GCMClient::Result result); 102 void CompleteSend(const std::string& message_id, GCMClient::Result result);
106 void AcknowledgeSend(const std::string& message_id); 103 void AcknowledgeSend(const std::string& message_id);
107 void MessageSendError(const std::string& message_id); 104 void MessageSendError(const std::string& message_id);
108 105
109 void CompleteSendAllMessages(); 106 void CompleteSendAllMessages();
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 account_mapping_.status = account_mapping.status; 148 account_mapping_.status = account_mapping.status;
152 account_mapping_.status_change_timestamp = 149 account_mapping_.status_change_timestamp =
153 account_mapping.status_change_timestamp; 150 account_mapping.status_change_timestamp;
154 account_mapping_.last_message_id = account_mapping.last_message_id; 151 account_mapping_.last_message_id = account_mapping.last_message_id;
155 } 152 }
156 153
157 void CustomFakeGCMDriver::RemoveAccountMapping(const std::string& account_id) { 154 void CustomFakeGCMDriver::RemoveAccountMapping(const std::string& account_id) {
158 last_removed_account_id_ = account_id; 155 last_removed_account_id_ = account_id;
159 } 156 }
160 157
161 void CustomFakeGCMDriver::AddAppHandler(const std::string& app_id,
162 GCMAppHandler* handler) {
163 GCMDriver::AddAppHandler(app_id, handler);
164 }
165
166 void CustomFakeGCMDriver::RemoveAppHandler(const std::string& app_id) {
167 GCMDriver::RemoveAppHandler(app_id);
168 }
169
170 void CustomFakeGCMDriver::RegisterImpl( 158 void CustomFakeGCMDriver::RegisterImpl(
171 const std::string& app_id, 159 const std::string& app_id,
172 const std::vector<std::string>& sender_ids) { 160 const std::vector<std::string>& sender_ids) {
173 DCHECK_EQ(kGCMAccountMapperAppId, app_id); 161 DCHECK_EQ(kGCMAccountMapperAppId, app_id);
174 DCHECK_EQ(1u, sender_ids.size()); 162 DCHECK_EQ(1u, sender_ids.size());
175 DCHECK_EQ(kGCMAccountMapperSenderId, sender_ids[0]); 163 DCHECK_EQ(kGCMAccountMapperSenderId, sender_ids[0]);
176 registration_id_requested_ = true; 164 registration_id_requested_ = true;
177 } 165 }
178 166
179 void CustomFakeGCMDriver::CompleteRegister(const std::string& registration_id, 167 void CustomFakeGCMDriver::CompleteRegister(const std::string& registration_id,
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 EXPECT_EQ(1UL, last_received_message().data.size()); 947 EXPECT_EQ(1UL, last_received_message().data.size());
960 MessageData::const_iterator it = 948 MessageData::const_iterator it =
961 last_received_message().data.find(kTestDataKey); 949 last_received_message().data.find(kTestDataKey);
962 EXPECT_TRUE(it != last_received_message().data.end()); 950 EXPECT_TRUE(it != last_received_message().data.end());
963 EXPECT_EQ(kTestDataValue, it->second); 951 EXPECT_EQ(kTestDataValue, it->second);
964 EXPECT_EQ(kTestCollapseKey, last_received_message().collapse_key); 952 EXPECT_EQ(kTestCollapseKey, last_received_message().collapse_key);
965 EXPECT_EQ(kTestSenderId, last_received_message().sender_id); 953 EXPECT_EQ(kTestSenderId, last_received_message().sender_id);
966 } 954 }
967 955
968 } // namespace gcm 956 } // namespace gcm
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698