| Index: chrome/browser/supervised_user/supervised_user_shared_settings_service_unittest.cc
|
| 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 f4e54b5d0f3c18f6316ca273a6f85d4dc70ac997..102a43b88af522013932f05370d84fe0d1fa8afb 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
|
| @@ -43,7 +43,7 @@ class MockSyncErrorFactory : public syncer::SyncErrorFactory {
|
| // SyncErrorFactory implementation:
|
| virtual syncer::SyncError CreateAndUploadError(
|
| const tracked_objects::Location& location,
|
| - const std::string& message) OVERRIDE;
|
| + const std::string& message) override;
|
|
|
| private:
|
| syncer::ModelType type_;
|
| @@ -114,13 +114,13 @@ class SupervisedUserSharedSettingsServiceTest : public ::testing::Test {
|
| }
|
|
|
| // testing::Test overrides:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| subscription_ = settings_service_.Subscribe(
|
| base::Bind(&SupervisedUserSharedSettingsServiceTest::OnSettingChanged,
|
| base::Unretained(this)));
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE { settings_service_.Shutdown(); }
|
| + virtual 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);
|
|
|