| Index: sync/test/engine/syncer_command_test.h
|
| diff --git a/sync/test/engine/syncer_command_test.h b/sync/test/engine/syncer_command_test.h
|
| index bcb084626375167cfc3fb9fc0baee42c7d25fabc..3db8ae8d47a99a132ef0c3c14558e53ee77b28c6 100644
|
| --- a/sync/test/engine/syncer_command_test.h
|
| +++ b/sync/test/engine/syncer_command_test.h
|
| @@ -211,7 +211,7 @@ class SyncerCommandTest : public SyncerCommandTestBase {
|
| public:
|
| virtual void SetUp() OVERRIDE;
|
| virtual void TearDown() OVERRIDE;
|
| - virtual Directory* directory() OVERRIDE;
|
| + virtual syncable::Directory* directory() OVERRIDE;
|
|
|
| private:
|
| TestDirectorySetterUpper dir_maker_;
|
| @@ -221,16 +221,16 @@ class MockDirectorySyncerCommandTest : public SyncerCommandTestBase {
|
| public:
|
| MockDirectorySyncerCommandTest();
|
| virtual ~MockDirectorySyncerCommandTest();
|
| - virtual Directory* directory() OVERRIDE;
|
| + virtual syncable::Directory* directory() OVERRIDE;
|
|
|
| - MockDirectory* mock_directory() {
|
| - return static_cast<MockDirectory*>(directory());
|
| + syncable::MockDirectory* mock_directory() {
|
| + return static_cast<syncable::MockDirectory*>(directory());
|
| }
|
|
|
| virtual void SetUp() OVERRIDE;
|
|
|
| TestUnrecoverableErrorHandler handler_;
|
| - MockDirectory mock_directory_;
|
| + syncable::MockDirectory mock_directory_;
|
| };
|
|
|
| } // namespace syncer
|
|
|