| Index: chrome/browser/services/gcm/fake_gcm_profile_service.h
|
| diff --git a/chrome/browser/services/gcm/fake_gcm_profile_service.h b/chrome/browser/services/gcm/fake_gcm_profile_service.h
|
| index 8ca88a3b0db847308e6cea8c4988a622c5f2e2f5..cb8445d0f90a4f5374c86ae4dae92309d06e6feb 100644
|
| --- a/chrome/browser/services/gcm/fake_gcm_profile_service.h
|
| +++ b/chrome/browser/services/gcm/fake_gcm_profile_service.h
|
| @@ -31,7 +31,7 @@ class FakeGCMProfileService : public GCMProfileService {
|
| UnregisterCallback callback) OVERRIDE;
|
| virtual void Send(const std::string& app_id,
|
| const std::string& receiver_id,
|
| - const GCMClient::OutgoingMessage& message,
|
| + const OutgoingMessage& message,
|
| SendCallback callback) OVERRIDE;
|
|
|
| void RegisterFinished(const std::string& app_id,
|
| @@ -40,13 +40,13 @@ class FakeGCMProfileService : public GCMProfileService {
|
|
|
| void SendFinished(const std::string& app_id,
|
| const std::string& receiver_id,
|
| - const GCMClient::OutgoingMessage& message,
|
| + const OutgoingMessage& message,
|
| SendCallback callback);
|
|
|
| - void AddExpectedUnregisterResponse(GCMClient::Result result);
|
| - GCMClient::Result GetNextExpectedUnregisterResponse();
|
| + void AddExpectedUnregisterResponse(Result result);
|
| + Result GetNextExpectedUnregisterResponse();
|
|
|
| - const GCMClient::OutgoingMessage& last_sent_message() const {
|
| + const OutgoingMessage& last_sent_message() const {
|
| return last_sent_message_;
|
| }
|
|
|
| @@ -72,8 +72,8 @@ class FakeGCMProfileService : public GCMProfileService {
|
| bool collect_;
|
| std::string last_registered_app_id_;
|
| std::vector<std::string> last_registered_sender_ids_;
|
| - std::vector<GCMClient::Result> unregister_responses_;
|
| - GCMClient::OutgoingMessage last_sent_message_;
|
| + std::vector<Result> unregister_responses_;
|
| + OutgoingMessage last_sent_message_;
|
| std::string last_receiver_id_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FakeGCMProfileService);
|
|
|