Index: components/sync/test/engine/test_syncable_utils.cc |
diff --git a/sync/test/engine/test_syncable_utils.cc b/components/sync/test/engine/test_syncable_utils.cc |
similarity index 79% |
rename from sync/test/engine/test_syncable_utils.cc |
rename to components/sync/test/engine/test_syncable_utils.cc |
index a2c36f411556c4fcd7cef765bdc174fa2801070d..2882013784a04201bc55a1cffdce0777cbff9a5d 100644 |
--- a/sync/test/engine/test_syncable_utils.cc |
+++ b/components/sync/test/engine/test_syncable_utils.cc |
@@ -4,14 +4,14 @@ |
// Utilities to verify the state of items in unit tests. |
-#include "sync/test/engine/test_syncable_utils.h" |
+#include "components/sync/test/engine/test_syncable_utils.h" |
-#include "sync/syncable/directory.h" |
-#include "sync/syncable/entry.h" |
-#include "sync/syncable/mutable_entry.h" |
-#include "sync/syncable/syncable_base_transaction.h" |
-#include "sync/syncable/syncable_write_transaction.h" |
-#include "sync/test/engine/test_id_factory.h" |
+#include "components/sync/syncable/directory.h" |
+#include "components/sync/syncable/entry.h" |
+#include "components/sync/syncable/mutable_entry.h" |
+#include "components/sync/syncable/syncable_base_transaction.h" |
+#include "components/sync/syncable/syncable_write_transaction.h" |
+#include "components/sync/test/engine/test_id_factory.h" |
using std::string; |
@@ -32,7 +32,7 @@ int CountEntriesWithName(BaseTransaction* rtrans, |
i != child_handles.end(); ++i) { |
Entry e(rtrans, GET_BY_HANDLE, *i); |
CHECK(e.good()); |
- if (e.GetNonUniqueName()== name) { |
+ if (e.GetNonUniqueName() == name) { |
++number_of_entries_with_name; |
} |
} |
@@ -49,7 +49,7 @@ Id GetFirstEntryWithName(BaseTransaction* rtrans, |
i != child_handles.end(); ++i) { |
Entry e(rtrans, GET_BY_HANDLE, *i); |
CHECK(e.good()); |
- if (e.GetNonUniqueName()== name) { |
+ if (e.GetNonUniqueName() == name) { |
return e.GetId(); |
} |
} |
@@ -66,14 +66,11 @@ Id GetOnlyEntryWithName(BaseTransaction* rtrans, |
} |
void CreateTypeRoot(WriteTransaction* trans, |
- syncable::Directory *dir, |
+ syncable::Directory* dir, |
ModelType type) { |
std::string tag_name = syncer::ModelTypeToRootTag(type); |
- syncable::MutableEntry node(trans, |
- syncable::CREATE, |
- type, |
- TestIdFactory::root(), |
- tag_name); |
+ syncable::MutableEntry node(trans, syncable::CREATE, type, |
+ TestIdFactory::root(), tag_name); |
DCHECK(node.good()); |
node.PutUniqueServerTag(tag_name); |
node.PutIsDir(true); |