| Index: chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
|
| index 90e9a180172d07297504937be88e413d79df5126..08bd79e39bb91aa6a03b5b59792c6169b6485ffe 100644
|
| --- a/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/frontend_data_type_controller_unittest.cc
|
| @@ -47,10 +47,10 @@ class FrontendDataTypeControllerFake : public FrontendDataTypeController {
|
| profile,
|
| sync_service),
|
| mock_(mock) {}
|
| - virtual syncer::ModelType type() const OVERRIDE { return syncer::BOOKMARKS; }
|
| + virtual syncer::ModelType type() const override { return syncer::BOOKMARKS; }
|
|
|
| private:
|
| - virtual void CreateSyncComponents() OVERRIDE {
|
| + virtual void CreateSyncComponents() override {
|
| ProfileSyncComponentsFactory::SyncComponents sync_components =
|
| profile_sync_factory_->
|
| CreateBookmarkSyncComponents(sync_service_, this);
|
| @@ -60,22 +60,22 @@ class FrontendDataTypeControllerFake : public FrontendDataTypeController {
|
|
|
| // We mock the following methods because their default implementations do
|
| // nothing, but we still want to make sure they're called appropriately.
|
| - virtual bool StartModels() OVERRIDE {
|
| + virtual bool StartModels() override {
|
| return mock_->StartModels();
|
| }
|
| - virtual void CleanUpState() OVERRIDE {
|
| + virtual void CleanUpState() override {
|
| mock_->CleanUpState();
|
| }
|
| virtual void RecordUnrecoverableError(
|
| const tracked_objects::Location& from_here,
|
| - const std::string& message) OVERRIDE {
|
| + const std::string& message) override {
|
| mock_->RecordUnrecoverableError(from_here, message);
|
| }
|
| - virtual void RecordAssociationTime(base::TimeDelta time) OVERRIDE {
|
| + virtual void RecordAssociationTime(base::TimeDelta time) override {
|
| mock_->RecordAssociationTime(time);
|
| }
|
| virtual void RecordStartFailure(
|
| - DataTypeController::ConfigureResult result) OVERRIDE {
|
| + DataTypeController::ConfigureResult result) override {
|
| mock_->RecordStartFailure(result);
|
| }
|
| private:
|
|
|