Index: components/gcm_driver/gcm_channel_status_request_unittest.cc |
diff --git a/components/gcm_driver/gcm_channel_status_request_unittest.cc b/components/gcm_driver/gcm_channel_status_request_unittest.cc |
index 961ca4e7c047e812a69592389a04f8a2492abf6c..daf812218e6b5c295dad41e1cd6797a88124a270 100644 |
--- a/components/gcm_driver/gcm_channel_status_request_unittest.cc |
+++ b/components/gcm_driver/gcm_channel_status_request_unittest.cc |
@@ -136,7 +136,7 @@ |
EXPECT_TRUE(request_callback_invoked_); |
EXPECT_FALSE(enabled_); |
EXPECT_EQ( |
- GCMChannelStatusRequest::default_poll_interval_seconds(), |
+ GCMChannelStatusRequest::default_poll_interval_seconds_for_testing(), |
poll_interval_seconds_); |
} |
@@ -148,7 +148,7 @@ |
EXPECT_TRUE(request_callback_invoked_); |
EXPECT_TRUE(enabled_); |
EXPECT_EQ( |
- GCMChannelStatusRequest::default_poll_interval_seconds(), |
+ GCMChannelStatusRequest::default_poll_interval_seconds_for_testing(), |
poll_interval_seconds_); |
} |
@@ -156,7 +156,8 @@ |
// Setting a poll interval 15 minutes longer than the minimum interval we |
// enforce. |
int poll_interval_seconds = |
- GCMChannelStatusRequest::min_poll_interval_seconds() + 15 * 60; |
+ GCMChannelStatusRequest::min_poll_interval_seconds_for_testing() + |
+ 15 * 60; |
StartRequest(); |
SetResponseProtoData(NOT_SPECIFIED, poll_interval_seconds); |
CompleteFetch(); |
@@ -170,20 +171,22 @@ |
// Setting a poll interval 15 minutes shorter than the minimum interval we |
// enforce. |
int poll_interval_seconds = |
- GCMChannelStatusRequest::min_poll_interval_seconds() - 15 * 60; |
+ GCMChannelStatusRequest::min_poll_interval_seconds_for_testing() - |
+ 15 * 60; |
StartRequest(); |
SetResponseProtoData(NOT_SPECIFIED, poll_interval_seconds); |
CompleteFetch(); |
EXPECT_TRUE(request_callback_invoked_); |
EXPECT_TRUE(enabled_); |
- EXPECT_EQ(GCMChannelStatusRequest::min_poll_interval_seconds(), |
+ EXPECT_EQ(GCMChannelStatusRequest::min_poll_interval_seconds_for_testing(), |
poll_interval_seconds_); |
} |
TEST_F(GCMChannelStatusRequestTest, ResponseWithDisabledStatusAndPollInterval) { |
int poll_interval_seconds = |
- GCMChannelStatusRequest::min_poll_interval_seconds() + 15 * 60; |
+ GCMChannelStatusRequest::min_poll_interval_seconds_for_testing() + |
+ 15 * 60; |
StartRequest(); |
SetResponseProtoData(GCM_DISABLED, poll_interval_seconds); |
CompleteFetch(); |