Index: sync/notifier/gcm_network_channel_unittest.cc |
diff --git a/sync/notifier/gcm_network_channel_unittest.cc b/sync/notifier/gcm_network_channel_unittest.cc |
index 006328bfecd6e1a4f8007a96cd9c17d78705afe2..afdfaf51bcdbff5d2e69e493bce1ef08fb663760 100644 |
--- a/sync/notifier/gcm_network_channel_unittest.cc |
+++ b/sync/notifier/gcm_network_channel_unittest.cc |
@@ -10,7 +10,6 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
namespace syncer { |
-namespace { |
class TestGCMNetworkChannelDelegate : public GCMNetworkChannelDelegate { |
public: |
@@ -108,6 +107,10 @@ class GCMNetworkChannelTest |
gcm_network_channel_->RemoveObserver(this); |
} |
+ static GURL BuildUrl(const std::string& registration_id) { |
+ return GCMNetworkChannel::BuildUrl(registration_id); |
+ } |
+ |
virtual void OnNetworkChannelStateChanged( |
InvalidatorState invalidator_state) OVERRIDE { |
} |
@@ -157,8 +160,9 @@ class GCMNetworkChannelTest |
}; |
TEST_F(GCMNetworkChannelTest, HappyCase) { |
- GURL url("http://invalid.url.com"); |
- url_fetcher_factory()->SetFakeResponse(url, std::string(), net::HTTP_OK, |
+ url_fetcher_factory()->SetFakeResponse(BuildUrl("registration.id"), |
+ std::string(), |
+ net::HTTP_OK, |
net::URLRequestStatus::SUCCESS); |
// After construction GCMNetworkChannel should have called Register. |
@@ -207,9 +211,10 @@ TEST_F(GCMNetworkChannelTest, FailedRegister) { |
} |
TEST_F(GCMNetworkChannelTest, RegisterFinishesAfterSendMessage) { |
- GURL url("http://invalid.url.com"); |
- url_fetcher_factory()->SetFakeResponse(url, "", net::HTTP_OK, |
- net::URLRequestStatus::SUCCESS); |
+ url_fetcher_factory()->SetFakeResponse(BuildUrl("registration.id"), |
+ "", |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
// After construction GCMNetworkChannel should have called Register. |
EXPECT_FALSE(delegate()->register_callback.is_null()); |
@@ -252,9 +257,10 @@ TEST_F(GCMNetworkChannelTest, RequestTokenFailure) { |
TEST_F(GCMNetworkChannelTest, AuthErrorFromServer) { |
// Setup fake response to return AUTH_ERROR. |
- GURL url("http://invalid.url.com"); |
- url_fetcher_factory()->SetFakeResponse(url, "", net::HTTP_UNAUTHORIZED, |
- net::URLRequestStatus::SUCCESS); |
+ url_fetcher_factory()->SetFakeResponse(BuildUrl("registration.id"), |
+ "", |
+ net::HTTP_UNAUTHORIZED, |
+ net::URLRequestStatus::SUCCESS); |
// After construction GCMNetworkChannel should have called Register. |
EXPECT_FALSE(delegate()->register_callback.is_null()); |
@@ -291,5 +297,4 @@ TEST_F(GCMNetworkChannelTest, RequestTokenNeverCompletes) { |
EXPECT_FALSE(delegate()->request_token_callback.is_null()); |
} |
-} // namespace |
} // namespace syncer |