| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "sync/api/sync_merge_result.h" | 5 #include "components/sync/api/sync_merge_result.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 | 9 |
| 10 namespace syncer { | 10 namespace syncer { |
| 11 | 11 |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 typedef testing::Test SyncMergeResultTest; | 14 typedef testing::Test SyncMergeResultTest; |
| 15 | 15 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 SyncMergeResult merge_result(BOOKMARKS); | 68 SyncMergeResult merge_result(BOOKMARKS); |
| 69 EXPECT_EQ(0, merge_result.num_items_modified()); | 69 EXPECT_EQ(0, merge_result.num_items_modified()); |
| 70 | 70 |
| 71 merge_result.set_num_items_modified(10); | 71 merge_result.set_num_items_modified(10); |
| 72 EXPECT_EQ(10, merge_result.num_items_modified()); | 72 EXPECT_EQ(10, merge_result.num_items_modified()); |
| 73 } | 73 } |
| 74 | 74 |
| 75 } // namespace | 75 } // namespace |
| 76 | 76 |
| 77 } // namespace syncer | 77 } // namespace syncer |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2130453004:
[Sync] Move //sync to //components/sync. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master