| 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 "chrome/browser/invalidation/ticl_profile_settings_provider.h" | 5 #include "chrome/browser/invalidation/ticl_profile_settings_provider.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/browser/invalidation/ticl_invalidation_service.h" | 9 #include "chrome/browser/invalidation/ticl_invalidation_service.h" |
| 10 #include "chrome/browser/invalidation/ticl_settings_provider.h" | |
| 11 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 11 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
| 13 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" | 12 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" |
| 14 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
| 15 #include "components/invalidation/ticl_settings_provider.h" |
| 16 #include "content/public/test/test_browser_thread_bundle.h" | 16 #include "content/public/test/test_browser_thread_bundle.h" |
| 17 #include "google_apis/gaia/fake_identity_provider.h" | 17 #include "google_apis/gaia/fake_identity_provider.h" |
| 18 #include "google_apis/gaia/fake_oauth2_token_service.h" | 18 #include "google_apis/gaia/fake_oauth2_token_service.h" |
| 19 #include "google_apis/gaia/identity_provider.h" | 19 #include "google_apis/gaia/identity_provider.h" |
| 20 #include "net/url_request/url_request_context_getter.h" | 20 #include "net/url_request/url_request_context_getter.h" |
| 21 #include "sync/notifier/fake_invalidation_state_tracker.h" | 21 #include "sync/notifier/fake_invalidation_state_tracker.h" |
| 22 #include "sync/notifier/invalidation_state_tracker.h" | 22 #include "sync/notifier/invalidation_state_tracker.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 24 | 24 |
| 25 namespace invalidation { | 25 namespace invalidation { |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel()); | 101 EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel()); |
| 102 | 102 |
| 103 // If invalidation channel setting is enabled first and the GCM setting is | 103 // If invalidation channel setting is enabled first and the GCM setting is |
| 104 // enabled after that, switch to GCM channel. | 104 // enabled after that, switch to GCM channel. |
| 105 prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true); | 105 prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true); |
| 106 prefs->SetBoolean(prefs::kGCMChannelEnabled, true); | 106 prefs->SetBoolean(prefs::kGCMChannelEnabled, true); |
| 107 EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel()); | 107 EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel()); |
| 108 } | 108 } |
| 109 | 109 |
| 110 } // namespace invalidation | 110 } // namespace invalidation |
| OLD | NEW |