| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <sstream> | 5 #include <sstream> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "chrome/browser/sync_file_system/remote_sync_operation_resolver.h" | 9 #include "chrome/browser/sync_file_system/remote_sync_operation_resolver.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| 11 #include "webkit/fileapi/syncable/file_change.h" | 11 #include "webkit/browser/fileapi/syncable/file_change.h" |
| 12 #include "webkit/fileapi/syncable/sync_file_type.h" | 12 #include "webkit/browser/fileapi/syncable/sync_file_type.h" |
| 13 | 13 |
| 14 namespace sync_file_system { | 14 namespace sync_file_system { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 struct Input { | 18 struct Input { |
| 19 SyncFileType local_file_type; | 19 SyncFileType local_file_type; |
| 20 FileChangeList local_changes; | 20 FileChangeList local_changes; |
| 21 | 21 |
| 22 std::string DebugString() { | 22 std::string DebugString() { |
| (...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 | 350 |
| 351 ASSERT_EQ(expected_types.size(), inputs.size()); | 351 ASSERT_EQ(expected_types.size(), inputs.size()); |
| 352 for (ExpectedTypes::size_type i = 0; i < expected_types.size(); ++i) | 352 for (ExpectedTypes::size_type i = 0; i < expected_types.size(); ++i) |
| 353 EXPECT_EQ(expected_types[i], | 353 EXPECT_EQ(expected_types[i], |
| 354 Resolver::ResolveForDeleteDirectoryInConflict( | 354 Resolver::ResolveForDeleteDirectoryInConflict( |
| 355 inputs[i].local_changes, inputs[i].local_file_type)) | 355 inputs[i].local_changes, inputs[i].local_file_type)) |
| 356 << "Case " << i << ": (" << inputs[i].DebugString() << ")"; | 356 << "Case " << i << ": (" << inputs[i].DebugString() << ")"; |
| 357 } | 357 } |
| 358 | 358 |
| 359 } // namespace sync_file_system | 359 } // namespace sync_file_system |
| OLD | NEW |