Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: chrome/browser/invalidation/ticl_profile_settings_provider_unittest.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs Created 6 years, 2 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
OLDNEW
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/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/services/gcm/gcm_profile_service.h" 10 #include "chrome/browser/services/gcm/gcm_profile_service.h"
(...skipping 12 matching lines...) Expand all
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 namespace invalidation { 25 namespace invalidation {
26 26
27 class TiclProfileSettingsProviderTest : public testing::Test { 27 class TiclProfileSettingsProviderTest : public testing::Test {
28 protected: 28 protected:
29 TiclProfileSettingsProviderTest(); 29 TiclProfileSettingsProviderTest();
30 virtual ~TiclProfileSettingsProviderTest(); 30 virtual ~TiclProfileSettingsProviderTest();
31 31
32 // testing::Test: 32 // testing::Test:
33 virtual void SetUp() OVERRIDE; 33 virtual void SetUp() override;
34 virtual void TearDown() OVERRIDE; 34 virtual void TearDown() override;
35 35
36 TiclInvalidationService::InvalidationNetworkChannel GetNetworkChannel(); 36 TiclInvalidationService::InvalidationNetworkChannel GetNetworkChannel();
37 37
38 content::TestBrowserThreadBundle thread_bundle_; 38 content::TestBrowserThreadBundle thread_bundle_;
39 TestingProfile profile_; 39 TestingProfile profile_;
40 FakeOAuth2TokenService token_service_; 40 FakeOAuth2TokenService token_service_;
41 41
42 scoped_ptr<TiclInvalidationService> invalidation_service_; 42 scoped_ptr<TiclInvalidationService> invalidation_service_;
43 43
44 private: 44 private:
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel()); 102 EXPECT_EQ(TiclInvalidationService::PUSH_CLIENT_CHANNEL, GetNetworkChannel());
103 103
104 // If invalidation channel setting is enabled first and the GCM setting is 104 // If invalidation channel setting is enabled first and the GCM setting is
105 // enabled after that, switch to GCM channel. 105 // enabled after that, switch to GCM channel.
106 prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true); 106 prefs->SetBoolean(prefs::kInvalidationServiceUseGCMChannel, true);
107 prefs->SetBoolean(prefs::kGCMChannelEnabled, true); 107 prefs->SetBoolean(prefs::kGCMChannelEnabled, true);
108 EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel()); 108 EXPECT_EQ(TiclInvalidationService::GCM_NETWORK_CHANNEL, GetNetworkChannel());
109 } 109 }
110 110
111 } // namespace invalidation 111 } // namespace invalidation
OLDNEW
« no previous file with comments | « chrome/browser/invalidation/ticl_profile_settings_provider.h ('k') | chrome/browser/io_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698