Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(489)

Side by Side Diff: components/sync/model/sync_merge_result_unittest.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/sync/model/sync_merge_result.cc ('k') | components/sync/model/syncable_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "components/sync/api/sync_merge_result.h" 5 #include "components/sync/model/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
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
OLDNEW
« no previous file with comments | « components/sync/model/sync_merge_result.cc ('k') | components/sync/model/syncable_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698