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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
7 #include "chrome/browser/sync/engine/resolve_conflicts_command.h" | 7 #include "sync/engine/resolve_conflicts_command.h" |
8 #include "chrome/browser/sync/sessions/sync_session.h" | 8 #include "sync/sessions/sync_session.h" |
9 #include "chrome/browser/sync/syncable/model_type.h" | 9 #include "sync/syncable/model_type.h" |
10 #include "chrome/browser/sync/syncable/syncable_id.h" | 10 #include "sync/syncable/syncable_id.h" |
11 #include "chrome/browser/sync/test/engine/fake_model_worker.h" | 11 #include "sync/test/engine/fake_model_worker.h" |
12 #include "chrome/browser/sync/test/engine/syncer_command_test.h" | 12 #include "sync/test/engine/syncer_command_test.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
14 | 14 |
15 namespace browser_sync { | 15 namespace browser_sync { |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 class ResolveConflictsCommandTest : public SyncerCommandTest { | 19 class ResolveConflictsCommandTest : public SyncerCommandTest { |
20 protected: | 20 protected: |
21 ResolveConflictsCommandTest() {} | 21 ResolveConflictsCommandTest() {} |
22 virtual ~ResolveConflictsCommandTest() {} | 22 virtual ~ResolveConflictsCommandTest() {} |
(...skipping 19 matching lines...) Expand all Loading... |
42 // Put GROUP_PASSWORD in conflict. | 42 // Put GROUP_PASSWORD in conflict. |
43 session()->mutable_status_controller()-> | 43 session()->mutable_status_controller()-> |
44 GetUnrestrictedMutableConflictProgressForTest(GROUP_PASSWORD)-> | 44 GetUnrestrictedMutableConflictProgressForTest(GROUP_PASSWORD)-> |
45 AddSimpleConflictingItemById(syncable::Id()); | 45 AddSimpleConflictingItemById(syncable::Id()); |
46 ExpectGroupToChange(command_, GROUP_PASSWORD); | 46 ExpectGroupToChange(command_, GROUP_PASSWORD); |
47 } | 47 } |
48 | 48 |
49 } // namespace | 49 } // namespace |
50 | 50 |
51 } // namespace browser_sync | 51 } // namespace browser_sync |
OLD | NEW |