components/invalidation/impl/ticl_profile_settings_provider_unittest.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

Side by Side Diff: components/invalidation/impl/ticl_profile_settings_provider_unittest.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « components/invalidation/impl/ticl_profile_settings_provider.cc ('k') | components/keyed_service/DEPS » ('j') | no next file with comments »

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/invalidation/impl/ticl_profile_settings_provider.h"	5 #include "components/invalidation/impl/ticl_profile_settings_provider.h"

6	6

7 #include "base/macros.h"	7 #include "base/macros.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/message_loop/message_loop.h"	9 #include "base/message_loop/message_loop.h"

	10 #include "base/prefs/pref_service.h"

10 #include "components/gcm_driver/fake_gcm_driver.h"	11 #include "components/gcm_driver/fake_gcm_driver.h"

11 #include "components/gcm_driver/gcm_channel_status_syncer.h"	12 #include "components/gcm_driver/gcm_channel_status_syncer.h"

12 #include "components/invalidation/impl/fake_invalidation_state_tracker.h"	13 #include "components/invalidation/impl/fake_invalidation_state_tracker.h"

13 #include "components/invalidation/impl/invalidation_prefs.h"	14 #include "components/invalidation/impl/invalidation_prefs.h"

14 #include "components/invalidation/impl/invalidation_state_tracker.h"	15 #include "components/invalidation/impl/invalidation_state_tracker.h"

15 #include "components/invalidation/impl/profile_invalidation_provider.h"	16 #include "components/invalidation/impl/profile_invalidation_provider.h"

16 #include "components/invalidation/impl/ticl_invalidation_service.h"	17 #include "components/invalidation/impl/ticl_invalidation_service.h"

17 #include "components/invalidation/impl/ticl_settings_provider.h"	18 #include "components/invalidation/impl/ticl_settings_provider.h"

18 #include "components/pref_registry/testing_pref_service_syncable.h"	19 #include "components/pref_registry/testing_pref_service_syncable.h"

19 #include "components/prefs/pref_service.h"

20 #include "google_apis/gaia/fake_identity_provider.h"	20 #include "google_apis/gaia/fake_identity_provider.h"

21 #include "google_apis/gaia/fake_oauth2_token_service.h"	21 #include "google_apis/gaia/fake_oauth2_token_service.h"

22 #include "google_apis/gaia/identity_provider.h"	22 #include "google_apis/gaia/identity_provider.h"

23 #include "net/url_request/url_request_context_getter.h"	23 #include "net/url_request/url_request_context_getter.h"

24 #include "net/url_request/url_request_test_util.h"	24 #include "net/url_request/url_request_test_util.h"

25 #include "testing/gtest/include/gtest/gtest.h"	25 #include "testing/gtest/include/gtest/gtest.h"

26	26

27 namespace invalidation {	27 namespace invalidation {

28	28

29 class TiclProfileSettingsProviderTest : public testing::Test {	29 class TiclProfileSettingsProviderTest : public testing::Test {

(...skipping 73 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 pref_service_.SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);	103 pref_service_.SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);

104 EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());	104 EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());

105	105

106 // If invalidation channel setting is set to false, fall back to push channel.	106 // If invalidation channel setting is set to false, fall back to push channel.

107 pref_service_.SetBoolean(gcm::prefs::kGCMChannelStatus, true);	107 pref_service_.SetBoolean(gcm::prefs::kGCMChannelStatus, true);

108 pref_service_.SetBoolean(prefs::kInvalidationServiceUseGCMChannel, false);	108 pref_service_.SetBoolean(prefs::kInvalidationServiceUseGCMChannel, false);

109 EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());	109 EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());

110 }	110 }

111	111

112 } // namespace invalidation	112 } // namespace invalidation

OLD	NEW