Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "google_apis/gcm/gcm_client_impl.h" | 5 #include "google_apis/gcm/gcm_client_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 243 const std::string& message_id, | 243 const std::string& message_id, |
| 244 GCMClient::Result result) OVERRIDE {} | 244 GCMClient::Result result) OVERRIDE {} |
| 245 virtual void OnMessageReceived(const std::string& registration_id, | 245 virtual void OnMessageReceived(const std::string& registration_id, |
| 246 const GCMClient::IncomingMessage& message) | 246 const GCMClient::IncomingMessage& message) |
| 247 OVERRIDE; | 247 OVERRIDE; |
| 248 virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE; | 248 virtual void OnMessagesDeleted(const std::string& app_id) OVERRIDE; |
| 249 virtual void OnMessageSendError( | 249 virtual void OnMessageSendError( |
| 250 const std::string& app_id, | 250 const std::string& app_id, |
| 251 const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE; | 251 const gcm::GCMClient::SendErrorDetails& send_error_details) OVERRIDE; |
| 252 virtual void OnGCMReady() OVERRIDE; | 252 virtual void OnGCMReady() OVERRIDE; |
| 253 virtual void OnActivityRecorded() OVERRIDE { | |
| 254 } | |
|
jianli
2014/05/06 22:54:53
nit: '}' should be appended to previous line.
juyik
2014/05/07 00:07:48
Done.
| |
| 253 | 255 |
| 254 GCMClientImpl* gcm_client() const { return gcm_client_.get(); } | 256 GCMClientImpl* gcm_client() const { return gcm_client_.get(); } |
| 255 FakeMCSClient* mcs_client() const { | 257 FakeMCSClient* mcs_client() const { |
| 256 return reinterpret_cast<FakeMCSClient*>(gcm_client_->mcs_client_.get()); | 258 return reinterpret_cast<FakeMCSClient*>(gcm_client_->mcs_client_.get()); |
| 257 } | 259 } |
| 258 ConnectionFactory* connection_factory() const { | 260 ConnectionFactory* connection_factory() const { |
| 259 return gcm_client_->connection_factory_.get(); | 261 return gcm_client_->connection_factory_.get(); |
| 260 } | 262 } |
| 261 | 263 |
| 262 void reset_last_event() { | 264 void reset_last_event() { |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 738 CompleteCheckin( | 740 CompleteCheckin( |
| 739 kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings); | 741 kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings); |
| 740 EXPECT_EQ(2, clock()->call_count()); | 742 EXPECT_EQ(2, clock()->call_count()); |
| 741 | 743 |
| 742 PumpLoopUntilIdle(); | 744 PumpLoopUntilIdle(); |
| 743 CompleteCheckin( | 745 CompleteCheckin( |
| 744 kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings); | 746 kDeviceAndroidId, kDeviceSecurityToken, kSettingsDefaultDigest, settings); |
| 745 } | 747 } |
| 746 | 748 |
| 747 } // namespace gcm | 749 } // namespace gcm |
| OLD | NEW |