[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/test/engine/single_type_mock_server.cc

Index: components/sync/test/engine/single_type_mock_server.cc
diff --git a/sync/test/engine/single_type_mock_server.cc b/components/sync/test/engine/single_type_mock_server.cc
similarity index 95%
copy from sync/test/engine/single_type_mock_server.cc
copy to components/sync/test/engine/single_type_mock_server.cc
index 6c0b5cdb34fbdf8e2ea7e5fe6d10fbe04022f24d..630d1bd1b858419f98c72f15d37d94cd1f0caec9 100644
--- a/sync/test/engine/single_type_mock_server.cc
+++ b/components/sync/test/engine/single_type_mock_server.cc
@@ -2,23 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "sync/test/engine/single_type_mock_server.h"
+#include "components/sync/test/engine/single_type_mock_server.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include "sync/util/time.h"
+#include "components/sync/base/time.h"
 
 using google::protobuf::RepeatedPtrField;
 
 namespace syncer {
 
 SingleTypeMockServer::SingleTypeMockServer(syncer::ModelType type)
-    : type_(type), type_root_id_(ModelTypeToRootTag(type)) {
-}
+    : type_(type), type_root_id_(ModelTypeToRootTag(type)) {}
 
-SingleTypeMockServer::~SingleTypeMockServer() {
-}
+SingleTypeMockServer::~SingleTypeMockServer() {}
 
 sync_pb::SyncEntity SingleTypeMockServer::TypeRootUpdate() {
   sync_pb::SyncEntity entity;
@@ -103,8 +101,7 @@ sync_pb::ClientToServerResponse SingleTypeMockServer::DoSuccessfulCommit(
       message.commit().entries();
   for (RepeatedPtrField<sync_pb::SyncEntity>::const_iterator it =
            entries.begin();
-       it != entries.end();
-       ++it) {
+       it != entries.end(); ++it) {
     const std::string tag_hash = it->client_defined_unique_tag();
 
     committed_items_[tag_hash] = *it;