Index: components/sync/engine_impl/syncer_proto_util_unittest.cc |
diff --git a/sync/engine/syncer_proto_util_unittest.cc b/components/sync/engine_impl/syncer_proto_util_unittest.cc |
similarity index 90% |
rename from sync/engine/syncer_proto_util_unittest.cc |
rename to components/sync/engine_impl/syncer_proto_util_unittest.cc |
index 4c14ebf35a9843074fce5a032d453f27d74c8a5b..47fe6eb20fc18eb46951061e3d9b27d806eb469f 100644 |
--- a/sync/engine/syncer_proto_util_unittest.cc |
+++ b/components/sync/engine_impl/syncer_proto_util_unittest.cc |
@@ -2,23 +2,23 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "sync/engine/syncer_proto_util.h" |
+#include "components/sync/engine_impl/syncer_proto_util.h" |
#include <string> |
#include "base/compiler_specific.h" |
#include "base/message_loop/message_loop.h" |
#include "base/time/time.h" |
-#include "sync/internal_api/public/base/cancelation_signal.h" |
-#include "sync/internal_api/public/base/model_type_test_util.h" |
-#include "sync/protocol/bookmark_specifics.pb.h" |
-#include "sync/protocol/password_specifics.pb.h" |
-#include "sync/protocol/sync.pb.h" |
-#include "sync/protocol/sync_enums.pb.h" |
-#include "sync/sessions/sync_session_context.h" |
-#include "sync/syncable/directory.h" |
-#include "sync/test/engine/mock_connection_manager.h" |
-#include "sync/test/engine/test_directory_setter_upper.h" |
+#include "components/sync/base/cancelation_signal.h" |
+#include "components/sync/base/model_type_test_util.h" |
+#include "components/sync/protocol/bookmark_specifics.pb.h" |
+#include "components/sync/protocol/password_specifics.pb.h" |
+#include "components/sync/protocol/sync.pb.h" |
+#include "components/sync/protocol/sync_enums.pb.h" |
+#include "components/sync/sessions_impl/sync_session_context.h" |
+#include "components/sync/syncable/directory.h" |
+#include "components/sync/test/engine/mock_connection_manager.h" |
+#include "components/sync/test/engine/test_directory_setter_upper.h" |
#include "testing/gtest/include/gtest/gtest.h" |
using ::testing::_; |
@@ -129,9 +129,7 @@ class SyncerProtoUtilTest : public testing::Test { |
void TearDown() override { dir_maker_.TearDown(); } |
- syncable::Directory* directory() { |
- return dir_maker_.directory(); |
- } |
+ syncable::Directory* directory() { return dir_maker_.directory(); } |
// Helper function to call GetProtocolErrorFromResponse. Allows not adding |
// individual tests as friends to SyncerProtoUtil. |
@@ -238,9 +236,7 @@ class DummyConnectionManager : public ServerConnectionManager { |
return true; |
} |
- void set_send_error(bool send) { |
- send_error_ = send; |
- } |
+ void set_send_error(bool send) { send_error_ = send; } |
private: |
bool send_error_; |
@@ -256,12 +252,12 @@ TEST_F(SyncerProtoUtilTest, PostAndProcessHeaders) { |
sync_pb::ClientToServerResponse response; |
dcm.set_send_error(true); |
- EXPECT_FALSE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL, |
- msg, &response)); |
+ EXPECT_FALSE( |
+ SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL, msg, &response)); |
dcm.set_send_error(false); |
- EXPECT_TRUE(SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL, |
- msg, &response)); |
+ EXPECT_TRUE( |
+ SyncerProtoUtil::PostAndProcessHeaders(&dcm, NULL, msg, &response)); |
} |
} // namespace syncer |