| 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 "components/gcm_driver/gcm_client_impl.h" | 5 #include "components/gcm_driver/gcm_client_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 gcm_client_->registrations_[app_id] = registration; | 440 gcm_client_->registrations_[app_id] = registration; |
| 441 } | 441 } |
| 442 | 442 |
| 443 void GCMClientImplTest::InitializeGCMClient() { | 443 void GCMClientImplTest::InitializeGCMClient() { |
| 444 clock()->Advance(base::TimeDelta::FromMilliseconds(1)); | 444 clock()->Advance(base::TimeDelta::FromMilliseconds(1)); |
| 445 | 445 |
| 446 // Actual initialization. | 446 // Actual initialization. |
| 447 GCMClient::ChromeBuildInfo chrome_build_info; | 447 GCMClient::ChromeBuildInfo chrome_build_info; |
| 448 gcm_client_->Initialize(chrome_build_info, | 448 gcm_client_->Initialize(chrome_build_info, |
| 449 temp_directory_.path(), | 449 temp_directory_.path(), |
| 450 std::vector<std::string>(), | |
| 451 message_loop_.message_loop_proxy(), | 450 message_loop_.message_loop_proxy(), |
| 452 url_request_context_getter_, | 451 url_request_context_getter_, |
| 453 make_scoped_ptr<Encryptor>(new FakeEncryptor), | 452 make_scoped_ptr<Encryptor>(new FakeEncryptor), |
| 454 this); | 453 this); |
| 455 | 454 |
| 456 // Start loading and check-in. | 455 // Start loading and check-in. |
| 457 gcm_client_->Start(); | 456 gcm_client_->Start(); |
| 458 | 457 |
| 459 PumpLoopUntilIdle(); | 458 PumpLoopUntilIdle(); |
| 460 } | 459 } |
| (...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 771 gservices_settings().GetCheckinURL()); | 770 gservices_settings().GetCheckinURL()); |
| 772 EXPECT_EQ(GURL("http://alternative.url/registration"), | 771 EXPECT_EQ(GURL("http://alternative.url/registration"), |
| 773 gservices_settings().GetRegistrationURL()); | 772 gservices_settings().GetRegistrationURL()); |
| 774 EXPECT_EQ(GURL("https://alternative.gcm.host:7777"), | 773 EXPECT_EQ(GURL("https://alternative.gcm.host:7777"), |
| 775 gservices_settings().GetMCSMainEndpoint()); | 774 gservices_settings().GetMCSMainEndpoint()); |
| 776 EXPECT_EQ(GURL("https://alternative.gcm.host:443"), | 775 EXPECT_EQ(GURL("https://alternative.gcm.host:443"), |
| 777 gservices_settings().GetMCSFallbackEndpoint()); | 776 gservices_settings().GetMCSFallbackEndpoint()); |
| 778 } | 777 } |
| 779 | 778 |
| 780 } // namespace gcm | 779 } // namespace gcm |
| OLD | NEW |