| Index: chrome/browser/sync/engine/syncer_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/sync/engine/syncer_unittest.cc (revision 26149)
|
| +++ chrome/browser/sync/engine/syncer_unittest.cc (working copy)
|
| @@ -13,6 +13,7 @@
|
| #include "base/at_exit.h"
|
|
|
| #include "base/scoped_ptr.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/browser/sync/engine/client_command_channel.h"
|
| #include "chrome/browser/sync/engine/conflict_resolution_view.h"
|
| #include "chrome/browser/sync/engine/conflict_resolver.h"
|
| @@ -28,7 +29,7 @@
|
| #include "chrome/browser/sync/syncable/directory_manager.h"
|
| #include "chrome/browser/sync/syncable/syncable.h"
|
| #include "chrome/browser/sync/util/character_set_converters.h"
|
| -#include "chrome/browser/sync/util/compat-file.h"
|
| +#include "chrome/browser/sync/util/compat_file.h"
|
| #include "chrome/browser/sync/util/event_sys-inl.h"
|
| #include "chrome/test/sync/engine/mock_server_connection.h"
|
| #include "chrome/test/sync/engine/test_directory_setter_upper.h"
|
| @@ -934,7 +935,7 @@
|
| syncer_->SyncShare();
|
| }
|
|
|
| -#ifdef OS_WINDOWS
|
| +#ifdef OS_WIN
|
| TEST_F(SyncerTest, NameSanitizationWithClientRename) {
|
| ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
|
| ASSERT_TRUE(dir.good());
|
|
|