| 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/location.h" | 5 #include "base/location.h" |
| 6 #include "chrome/browser/sync/engine/verify_updates_command.h" | 6 #include "sync/engine/verify_updates_command.h" |
| 7 #include "chrome/browser/sync/sessions/session_state.h" | 7 #include "sync/sessions/session_state.h" |
| 8 #include "chrome/browser/sync/sessions/sync_session.h" | 8 #include "sync/sessions/sync_session.h" |
| 9 #include "chrome/browser/sync/syncable/syncable.h" | 9 #include "sync/syncable/syncable.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 "sync/protocol/bookmark_specifics.pb.h" | 13 #include "sync/protocol/bookmark_specifics.pb.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 15 | 15 |
| 16 namespace browser_sync { | 16 namespace browser_sync { |
| 17 | 17 |
| 18 using sessions::SyncSession; | 18 using sessions::SyncSession; |
| 19 using sessions::StatusController; | 19 using sessions::StatusController; |
| 20 using std::string; | 20 using std::string; |
| 21 using syncable::Entry; | 21 using syncable::Entry; |
| 22 using syncable::Id; | 22 using syncable::Id; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 ASSERT_TRUE(status->update_progress()); | 102 ASSERT_TRUE(status->update_progress()); |
| 103 EXPECT_EQ(1, status->update_progress()->VerifiedUpdatesSize()); | 103 EXPECT_EQ(1, status->update_progress()->VerifiedUpdatesSize()); |
| 104 } | 104 } |
| 105 { | 105 { |
| 106 sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE); | 106 sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE); |
| 107 EXPECT_FALSE(status->update_progress()); | 107 EXPECT_FALSE(status->update_progress()); |
| 108 } | 108 } |
| 109 } | 109 } |
| 110 | 110 |
| 111 } | 111 } |
| OLD | NEW |