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/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/test/simple_test_clock.h" | 10 #include "base/test/simple_test_clock.h" |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 277 gcm_client_->SetMCSClientForTesting(scoped_ptr<MCSClient>( | 277 gcm_client_->SetMCSClientForTesting(scoped_ptr<MCSClient>( |
| 278 new FakeMCSClient(clock(), connection_factory_.get())).Pass()); | 278 new FakeMCSClient(clock(), connection_factory_.get())).Pass()); |
| 279 // Actual initialization. | 279 // Actual initialization. |
| 280 checkin_proto::ChromeBuildProto chrome_build_proto; | 280 checkin_proto::ChromeBuildProto chrome_build_proto; |
| 281 gcm_client_->Initialize(chrome_build_proto, | 281 gcm_client_->Initialize(chrome_build_proto, |
| 282 temp_directory_.path(), | 282 temp_directory_.path(), |
| 283 std::vector<std::string>(), | 283 std::vector<std::string>(), |
| 284 message_loop_.message_loop_proxy(), | 284 message_loop_.message_loop_proxy(), |
| 285 url_request_context_getter_, | 285 url_request_context_getter_, |
| 286 this); | 286 this); |
| 287 // Starting loading and check-in. | |
| 288 gcm_client_->Load(); | |
|
fgorski
2014/02/26 18:36:31
move after the encryptor update
jianli
2014/02/26 19:04:25
Done.
| |
| 287 #if defined(OS_MACOSX) | 289 #if defined(OS_MACOSX) |
| 288 // On OSX, prevent the Keychain permissions popup during unit tests. | 290 // On OSX, prevent the Keychain permissions popup during unit tests. |
| 289 Encryptor::UseMockKeychain(true); // Must be after Initialize. | 291 Encryptor::UseMockKeychain(true); // Must be after Initialize. |
| 290 #endif | 292 #endif |
| 291 // Ensuring that mcs_client is using the same gcm_store as gcm_client. | 293 // Ensuring that mcs_client is using the same gcm_store as gcm_client. |
| 292 mcs_client()->set_gcm_store(gcm_client_->gcm_store_.get()); | 294 mcs_client()->set_gcm_store(gcm_client_->gcm_store_.get()); |
| 293 PumpLoopUntilIdle(); | 295 PumpLoopUntilIdle(); |
| 294 CompleteCheckin(kDeviceAndroidId, kDeviceSecurityToken); | 296 CompleteCheckin(kDeviceAndroidId, kDeviceSecurityToken); |
| 295 } | 297 } |
| 296 | 298 |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 439 EXPECT_EQ(CurrentTime(), mcs_client()->last_data_message_stanza().sent()); | 441 EXPECT_EQ(CurrentTime(), mcs_client()->last_data_message_stanza().sent()); |
| 440 EXPECT_EQ("007", mcs_client()->last_data_message_stanza().id()); | 442 EXPECT_EQ("007", mcs_client()->last_data_message_stanza().id()); |
| 441 EXPECT_EQ("gcm@chrome.com", mcs_client()->last_data_message_stanza().from()); | 443 EXPECT_EQ("gcm@chrome.com", mcs_client()->last_data_message_stanza().from()); |
| 442 EXPECT_EQ("project_id", mcs_client()->last_data_message_stanza().to()); | 444 EXPECT_EQ("project_id", mcs_client()->last_data_message_stanza().to()); |
| 443 EXPECT_EQ("key", mcs_client()->last_data_message_stanza().app_data(0).key()); | 445 EXPECT_EQ("key", mcs_client()->last_data_message_stanza().app_data(0).key()); |
| 444 EXPECT_EQ("value", | 446 EXPECT_EQ("value", |
| 445 mcs_client()->last_data_message_stanza().app_data(0).value()); | 447 mcs_client()->last_data_message_stanza().app_data(0).value()); |
| 446 } | 448 } |
| 447 | 449 |
| 448 } // namespace gcm | 450 } // namespace gcm |
| OLD | NEW |