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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 gcm_client_->clock_.reset(new base::SimpleTestClock); | 273 gcm_client_->clock_.reset(new base::SimpleTestClock); |
274 clock()->Advance(base::TimeDelta::FromMilliseconds(1)); | 274 clock()->Advance(base::TimeDelta::FromMilliseconds(1)); |
275 // Creating and injecting the mcs_client. | 275 // Creating and injecting the mcs_client. |
276 connection_factory_.reset(new FakeConnectionFactory()); | 276 connection_factory_.reset(new FakeConnectionFactory()); |
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 message_loop_.message_loop_proxy(), | 284 message_loop_.message_loop_proxy(), |
284 url_request_context_getter_, | 285 url_request_context_getter_, |
285 this); | 286 this); |
286 #if defined(OS_MACOSX) | 287 #if defined(OS_MACOSX) |
287 // On OSX, prevent the Keychain permissions popup during unit tests. | 288 // On OSX, prevent the Keychain permissions popup during unit tests. |
288 Encryptor::UseMockKeychain(true); // Must be after Initialize. | 289 Encryptor::UseMockKeychain(true); // Must be after Initialize. |
289 #endif | 290 #endif |
290 // Ensuring that mcs_client is using the same gcm_store as gcm_client. | 291 // Ensuring that mcs_client is using the same gcm_store as gcm_client. |
291 mcs_client()->set_gcm_store(gcm_client_->gcm_store_.get()); | 292 mcs_client()->set_gcm_store(gcm_client_->gcm_store_.get()); |
292 PumpLoopUntilIdle(); | 293 PumpLoopUntilIdle(); |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
438 EXPECT_EQ(CurrentTime(), mcs_client()->last_data_message_stanza().sent()); | 439 EXPECT_EQ(CurrentTime(), mcs_client()->last_data_message_stanza().sent()); |
439 EXPECT_EQ("007", mcs_client()->last_data_message_stanza().id()); | 440 EXPECT_EQ("007", mcs_client()->last_data_message_stanza().id()); |
440 EXPECT_EQ("gcm@chrome.com", mcs_client()->last_data_message_stanza().from()); | 441 EXPECT_EQ("gcm@chrome.com", mcs_client()->last_data_message_stanza().from()); |
441 EXPECT_EQ("project_id", mcs_client()->last_data_message_stanza().to()); | 442 EXPECT_EQ("project_id", mcs_client()->last_data_message_stanza().to()); |
442 EXPECT_EQ("key", mcs_client()->last_data_message_stanza().app_data(0).key()); | 443 EXPECT_EQ("key", mcs_client()->last_data_message_stanza().app_data(0).key()); |
443 EXPECT_EQ("value", | 444 EXPECT_EQ("value", |
444 mcs_client()->last_data_message_stanza().app_data(0).value()); | 445 mcs_client()->last_data_message_stanza().app_data(0).value()); |
445 } | 446 } |
446 | 447 |
447 } // namespace gcm | 448 } // namespace gcm |
OLD | NEW |