diff options
Diffstat (limited to 'chrome/browser/supervised_user')
12 files changed, 24 insertions, 32 deletions
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc index dc8c286..213e0b5 100644 --- a/chrome/browser/supervised_user/supervised_user_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc @@ -53,7 +53,7 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest { }; SupervisedUserBlockModeTest() : supervised_user_service_(NULL) {} - virtual ~SupervisedUserBlockModeTest() {} + ~SupervisedUserBlockModeTest() override {} void CheckShownPageIsInterstitial(WebContents* tab) { CheckShownPage(tab, content::PAGE_TYPE_INTERSTITIAL); diff --git a/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc index 3c0af60..bae82f9 100644 --- a/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_mapping_service_unittest.cc @@ -28,14 +28,12 @@ class SupervisedUserPrefMappingServiceTest : public ::testing::Test { SupervisedUserPrefMappingServiceFactory::GetForBrowserContext( &profile_); } - virtual ~SupervisedUserPrefMappingServiceTest() {} + ~SupervisedUserPrefMappingServiceTest() override {} // testing::Test overrides: - virtual void SetUp() override { - mapping_service_->Init(); - } + void SetUp() override { mapping_service_->Init(); } - virtual void TearDown() override { + void TearDown() override { mapping_service_->Shutdown(); shared_settings_service_->Shutdown(); } diff --git a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc index 49ca495..7e80748 100644 --- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc @@ -72,8 +72,8 @@ void SupervisedUserPrefStoreFixture::OnInitializationCompleted(bool succeeded) { class SupervisedUserPrefStoreTest : public ::testing::Test { public: - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: SupervisedUserSettingsService service_; diff --git a/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc index 621d3ca..9e03160 100644 --- a/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc @@ -89,7 +89,7 @@ void VerifyTokenRequest( class SupervisedUserRefreshTokenFetcherTest : public testing::Test { public: SupervisedUserRefreshTokenFetcherTest(); - virtual ~SupervisedUserRefreshTokenFetcherTest() {} + ~SupervisedUserRefreshTokenFetcherTest() override {} protected: void StartFetching(); diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc b/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc index a5831cb..2e37027 100644 --- a/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_registration_utility_unittest.cc @@ -89,9 +89,9 @@ class MockSupervisedUserRefreshTokenFetcher class SupervisedUserRegistrationUtilityTest : public ::testing::Test { public: SupervisedUserRegistrationUtilityTest(); - virtual ~SupervisedUserRegistrationUtilityTest(); + ~SupervisedUserRegistrationUtilityTest() override; - virtual void TearDown() override; + void TearDown() override; protected: scoped_ptr<SyncChangeProcessor> CreateChangeProcessor(); diff --git a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc index ac57bcf..f198127 100644 --- a/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_resource_throttle_browsertest.cc @@ -30,7 +30,7 @@ using content::WebContents; class SupervisedUserResourceThrottleTest : public InProcessBrowserTest { protected: SupervisedUserResourceThrottleTest() : supervised_user_service_(NULL) {} - virtual ~SupervisedUserResourceThrottleTest() {} + ~SupervisedUserResourceThrottleTest() override {} private: void SetUpOnMainThread() override; diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc index a37c3af..8e6a531 100644 --- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc @@ -98,7 +98,7 @@ class SupervisedUserServiceTest : public ::testing::Test { public: SupervisedUserServiceTest() {} - virtual void SetUp() override { + void SetUp() override { TestingProfile::Builder builder; builder.AddTestingFactory(ProfileOAuth2TokenServiceFactory::GetInstance(), BuildFakeProfileOAuth2TokenService); @@ -107,11 +107,9 @@ class SupervisedUserServiceTest : public ::testing::Test { SupervisedUserServiceFactory::GetForProfile(profile_.get()); } - virtual void TearDown() override { - profile_.reset(); - } + void TearDown() override { profile_.reset(); } - virtual ~SupervisedUserServiceTest() {} + ~SupervisedUserServiceTest() override {} protected: void AddAccessRequest(const GURL& url, AsyncResultHolder* result_holder) { @@ -275,9 +273,9 @@ class SupervisedUserServiceExtensionTestBase explicit SupervisedUserServiceExtensionTestBase(bool is_supervised) : is_supervised_(is_supervised), channel_(chrome::VersionInfo::CHANNEL_DEV) {} - virtual ~SupervisedUserServiceExtensionTestBase() {} + ~SupervisedUserServiceExtensionTestBase() override {} - virtual void SetUp() override { + void SetUp() override { ExtensionServiceTestBase::SetUp(); ExtensionServiceTestBase::ExtensionServiceInitParams params = CreateDefaultInitParams(); diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc index 934d6a9..3435e32 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc @@ -57,7 +57,7 @@ const char kSplitItemName[] = "X-SuperMoosePowers"; class SupervisedUserSettingsServiceTest : public ::testing::Test { protected: SupervisedUserSettingsServiceTest() {} - virtual ~SupervisedUserSettingsServiceTest() {} + ~SupervisedUserSettingsServiceTest() override {} scoped_ptr<syncer::SyncChangeProcessor> CreateSyncProcessor() { sync_processor_.reset(new syncer::FakeSyncChangeProcessor); @@ -119,7 +119,7 @@ class SupervisedUserSettingsServiceTest : public ::testing::Test { } // testing::Test overrides: - virtual void SetUp() override { + void SetUp() override { TestingPrefStore* pref_store = new TestingPrefStore; settings_service_.Init(pref_store); settings_service_.Subscribe( @@ -131,9 +131,7 @@ class SupervisedUserSettingsServiceTest : public ::testing::Test { ASSERT_TRUE(settings_); } - virtual void TearDown() override { - settings_service_.Shutdown(); - } + void TearDown() override { settings_service_.Shutdown(); } base::DictionaryValue split_items_; scoped_ptr<base::Value> atomic_setting_value_; diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc index 72e3f8e..619daca 100644 --- a/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc @@ -81,7 +81,7 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test { SupervisedUserSharedSettingsServiceTest() : settings_service_(profile_.GetPrefs()) {} - virtual ~SupervisedUserSharedSettingsServiceTest() {} + ~SupervisedUserSharedSettingsServiceTest() override {} void StartSyncing(const syncer::SyncDataList& initial_sync_data) { sync_processor_.reset(new syncer::FakeSyncChangeProcessor); @@ -114,13 +114,13 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test { } // testing::Test overrides: - virtual void SetUp() override { + void SetUp() override { subscription_ = settings_service_.Subscribe( base::Bind(&SupervisedUserSharedSettingsServiceTest::OnSettingChanged, base::Unretained(this))); } - virtual void TearDown() override { settings_service_.Shutdown(); } + void TearDown() override { settings_service_.Shutdown(); } void OnSettingChanged(const std::string& su_id, const std::string& key) { const Value* value = settings_service_.GetValue(su_id, key); diff --git a/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc b/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc index 1266ccde..9289738 100644 --- a/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_shared_settings_update_unittest.cc @@ -13,7 +13,7 @@ class SupervisedUserSharedSettingsUpdateTest : public testing::Test { public: SupervisedUserSharedSettingsUpdateTest() : service_(profile_.GetPrefs()) {} - virtual ~SupervisedUserSharedSettingsUpdateTest() {} + ~SupervisedUserSharedSettingsUpdateTest() override {} void OnSettingUpdated(bool success) { result_.reset(new bool(success)); diff --git a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc index 6c50265..c99da73 100644 --- a/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc @@ -84,7 +84,7 @@ void GetSupervisedUsersCallback(const base::DictionaryValue** dict, class SupervisedUserSyncServiceTest : public ::testing::Test { public: SupervisedUserSyncServiceTest(); - virtual ~SupervisedUserSyncServiceTest(); + ~SupervisedUserSyncServiceTest() override; protected: scoped_ptr<SyncChangeProcessor> CreateChangeProcessor(); diff --git a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc index 4885b6c..2ea0127 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc @@ -18,9 +18,7 @@ class SupervisedUserURLFilterTest : public ::testing::Test, filter_->AddObserver(this); } - virtual ~SupervisedUserURLFilterTest() { - filter_->RemoveObserver(this); - } + ~SupervisedUserURLFilterTest() override { filter_->RemoveObserver(this); } // SupervisedUserURLFilter::Observer: void OnSiteListUpdated() override { run_loop_.Quit(); } |