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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 <string> 5 #include <string>
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/supervised_user/supervised_user_constants.h" 8 #include "chrome/browser/supervised_user/supervised_user_constants.h"
9 #include "chrome/browser/supervised_user/supervised_user_pref_mapping_service.h" 9 #include "chrome/browser/supervised_user/supervised_user_pref_mapping_service.h"
10 #include "chrome/browser/supervised_user/supervised_user_pref_mapping_service_fa ctory.h" 10 #include "chrome/browser/supervised_user/supervised_user_pref_mapping_service_fa ctory.h"
(...skipping 13 matching lines...) Expand all
24 shared_settings_service_ = 24 shared_settings_service_ =
25 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext( 25 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
26 &profile_); 26 &profile_);
27 mapping_service_ = 27 mapping_service_ =
28 SupervisedUserPrefMappingServiceFactory::GetForBrowserContext( 28 SupervisedUserPrefMappingServiceFactory::GetForBrowserContext(
29 &profile_); 29 &profile_);
30 } 30 }
31 virtual ~SupervisedUserPrefMappingServiceTest() {} 31 virtual ~SupervisedUserPrefMappingServiceTest() {}
32 32
33 // testing::Test overrides: 33 // testing::Test overrides:
34 virtual void SetUp() OVERRIDE { 34 virtual void SetUp() override {
35 mapping_service_->Init(); 35 mapping_service_->Init();
36 } 36 }
37 37
38 virtual void TearDown() OVERRIDE { 38 virtual void TearDown() override {
39 mapping_service_->Shutdown(); 39 mapping_service_->Shutdown();
40 shared_settings_service_->Shutdown(); 40 shared_settings_service_->Shutdown();
41 } 41 }
42 42
43 TestingProfile profile_; 43 TestingProfile profile_;
44 SupervisedUserSharedSettingsService* shared_settings_service_; 44 SupervisedUserSharedSettingsService* shared_settings_service_;
45 SupervisedUserPrefMappingService* mapping_service_; 45 SupervisedUserPrefMappingService* mapping_service_;
46 }; 46 };
47 47
48 TEST_F(SupervisedUserPrefMappingServiceTest, CheckPrefUpdate) { 48 TEST_F(SupervisedUserPrefMappingServiceTest, CheckPrefUpdate) {
(...skipping 11 matching lines...) Expand all
60 TEST_F(SupervisedUserPrefMappingServiceTest, CheckSharedSettingUpdate) { 60 TEST_F(SupervisedUserPrefMappingServiceTest, CheckSharedSettingUpdate) {
61 EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), -1); 61 EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), -1);
62 shared_settings_service_->SetValue(kFakeSupervisedUserId, 62 shared_settings_service_->SetValue(kFakeSupervisedUserId,
63 supervised_users::kChromeAvatarIndex, 63 supervised_users::kChromeAvatarIndex,
64 base::FundamentalValue(1)); 64 base::FundamentalValue(1));
65 mapping_service_->OnSharedSettingChanged( 65 mapping_service_->OnSharedSettingChanged(
66 kFakeSupervisedUserId, 66 kFakeSupervisedUserId,
67 supervised_users::kChromeAvatarIndex); 67 supervised_users::kChromeAvatarIndex);
68 EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), 1); 68 EXPECT_EQ(profile_.GetPrefs()->GetInteger(prefs::kProfileAvatarIndex), 1);
69 } 69 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698