| 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 "sync/engine/process_updates_command.h" | 7 #include "sync/engine/process_updates_command.h" |
| 8 #include "sync/internal_api/public/syncable/model_type.h" | 8 #include "sync/internal_api/public/base/model_type.h" |
| 9 #include "sync/sessions/session_state.h" | 9 #include "sync/sessions/session_state.h" |
| 10 #include "sync/sessions/sync_session.h" | 10 #include "sync/sessions/sync_session.h" |
| 11 #include "sync/syncable/syncable_id.h" | 11 #include "sync/syncable/syncable_id.h" |
| 12 #include "sync/test/engine/fake_model_worker.h" | 12 #include "sync/test/engine/fake_model_worker.h" |
| 13 #include "sync/test/engine/syncer_command_test.h" | 13 #include "sync/test/engine/syncer_command_test.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 15 |
| 16 namespace syncer { | 16 namespace syncer { |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 43 // Add a verified update for GROUP_DB. | 43 // Add a verified update for GROUP_DB. |
| 44 session()->mutable_status_controller()-> | 44 session()->mutable_status_controller()-> |
| 45 GetUnrestrictedMutableUpdateProgressForTest(GROUP_DB)-> | 45 GetUnrestrictedMutableUpdateProgressForTest(GROUP_DB)-> |
| 46 AddVerifyResult(VerifyResult(), sync_pb::SyncEntity()); | 46 AddVerifyResult(VerifyResult(), sync_pb::SyncEntity()); |
| 47 ExpectGroupToChange(command_, GROUP_DB); | 47 ExpectGroupToChange(command_, GROUP_DB); |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace | 50 } // namespace |
| 51 | 51 |
| 52 } // namespace syncer | 52 } // namespace syncer |
| OLD | NEW |