Index: google_apis/gcm/engine/checkin_request_unittest.cc |
diff --git a/google_apis/gcm/engine/checkin_request_unittest.cc b/google_apis/gcm/engine/checkin_request_unittest.cc |
index e750df077cbe9ce218e08f57649c4a583b22c495..0142e0ca4f135b1ebf3f599d2f781c25953c1559 100644 |
--- a/google_apis/gcm/engine/checkin_request_unittest.cc |
+++ b/google_apis/gcm/engine/checkin_request_unittest.cc |
@@ -51,7 +51,6 @@ |
const uint64 kBlankSecurityToken = 999999UL; |
const char kChromeVersion[] = "Version String"; |
const uint64 kSecurityToken = 77; |
-const char kSettingsDigest[] = "settings_digest"; |
class CheckinRequestTest : public testing::Test { |
public: |
@@ -66,8 +65,7 @@ |
CheckinRequestTest(); |
virtual ~CheckinRequestTest(); |
- void FetcherCallback( |
- const checkin_proto::AndroidCheckinResponse& response); |
+ void FetcherCallback(uint64 android_id, uint64 security_token); |
void CreateRequest(uint64 android_id, uint64 security_token); |
@@ -104,13 +102,11 @@ |
CheckinRequestTest::~CheckinRequestTest() {} |
-void CheckinRequestTest::FetcherCallback( |
- const checkin_proto::AndroidCheckinResponse& checkin_response) { |
+void CheckinRequestTest::FetcherCallback(uint64 android_id, |
+ uint64 security_token) { |
callback_called_ = true; |
- if (checkin_response.has_android_id()) |
- android_id_ = checkin_response.android_id(); |
- if (checkin_response.has_security_token()) |
- security_token_ = checkin_response.security_token(); |
+ android_id_ = android_id; |
+ security_token_ = security_token; |
} |
void CheckinRequestTest::CreateRequest(uint64 android_id, |
@@ -121,19 +117,15 @@ |
chrome_build_proto_.set_channel( |
checkin_proto::ChromeBuildProto::CHANNEL_CANARY); |
chrome_build_proto_.set_chrome_version(kChromeVersion); |
- |
- CheckinRequest::RequestInfo request_info( |
- android_id, |
- security_token, |
- kSettingsDigest, |
- account_ids_, |
- chrome_build_proto_); |
// Then create a request with that protobuf and specified android_id, |
// security_token. |
request_.reset(new CheckinRequest( |
- request_info, |
+ base::Bind(&CheckinRequestTest::FetcherCallback, base::Unretained(this)), |
kDefaultBackoffPolicy, |
- base::Bind(&CheckinRequestTest::FetcherCallback, base::Unretained(this)), |
+ chrome_build_proto_, |
+ android_id, |
+ security_token, |
+ account_ids_, |
url_request_context_getter_.get())); |
// Setting android_id_ and security_token_ to blank value, not used elsewhere |
@@ -206,7 +198,6 @@ |
request_proto.checkin().type()); |
#endif |
- EXPECT_EQ(kSettingsDigest, request_proto.digest()); |
EXPECT_EQ(1, request_proto.account_cookie_size()); |
EXPECT_EQ("[account_id]", request_proto.account_cookie(0)); |
} |
@@ -253,8 +244,8 @@ |
CompleteFetch(); |
EXPECT_TRUE(callback_called_); |
- EXPECT_EQ(kBlankAndroidId, android_id_); |
- EXPECT_EQ(kBlankSecurityToken, security_token_); |
+ EXPECT_EQ(0u, android_id_); |
+ EXPECT_EQ(0u, security_token_); |
} |
TEST_F(CheckinRequestTest, ResponseHttpStatusBadRequest) { |
@@ -265,8 +256,8 @@ |
CompleteFetch(); |
EXPECT_TRUE(callback_called_); |
- EXPECT_EQ(kBlankAndroidId, android_id_); |
- EXPECT_EQ(kBlankSecurityToken, security_token_); |
+ EXPECT_EQ(0u, android_id_); |
+ EXPECT_EQ(0u, security_token_); |
} |
TEST_F(CheckinRequestTest, ResponseHttpStatusNotOK) { |