| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <set> | 5 #include <set> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 class WriteTransactionTest: public WriteTransaction { | 585 class WriteTransactionTest: public WriteTransaction { |
| 586 public: | 586 public: |
| 587 WriteTransactionTest(const tracked_objects::Location& from_here, | 587 WriteTransactionTest(const tracked_objects::Location& from_here, |
| 588 WriterTag writer, | 588 WriterTag writer, |
| 589 const syncable::ScopedDirLookup& directory, | 589 const syncable::ScopedDirLookup& directory, |
| 590 scoped_ptr<WaitableEvent>* wait_for_syncapi) | 590 scoped_ptr<WaitableEvent>* wait_for_syncapi) |
| 591 : WriteTransaction(from_here, writer, directory), | 591 : WriteTransaction(from_here, writer, directory), |
| 592 wait_for_syncapi_(wait_for_syncapi) { } | 592 wait_for_syncapi_(wait_for_syncapi) { } |
| 593 | 593 |
| 594 virtual void NotifyTransactionComplete( | 594 virtual void NotifyTransactionComplete( |
| 595 syncable::ModelTypeBitSet types) OVERRIDE { | 595 syncable::ModelEnumSet types) OVERRIDE { |
| 596 // This is where we differ. Force a thread change here, giving another | 596 // This is where we differ. Force a thread change here, giving another |
| 597 // thread a chance to create a WriteTransaction | 597 // thread a chance to create a WriteTransaction |
| 598 (*wait_for_syncapi_)->Wait(); | 598 (*wait_for_syncapi_)->Wait(); |
| 599 | 599 |
| 600 WriteTransaction::NotifyTransactionComplete(types); | 600 WriteTransaction::NotifyTransactionComplete(types); |
| 601 } | 601 } |
| 602 | 602 |
| 603 private: | 603 private: |
| 604 scoped_ptr<WaitableEvent>* wait_for_syncapi_; | 604 scoped_ptr<WaitableEvent>* wait_for_syncapi_; |
| 605 }; | 605 }; |
| (...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1129 std::vector<AutofillEntry> sync_entries; | 1129 std::vector<AutofillEntry> sync_entries; |
| 1130 std::vector<AutofillProfile> sync_profiles; | 1130 std::vector<AutofillProfile> sync_profiles; |
| 1131 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); | 1131 ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles)); |
| 1132 EXPECT_EQ(3U, sync_entries.size()); | 1132 EXPECT_EQ(3U, sync_entries.size()); |
| 1133 EXPECT_EQ(0U, sync_profiles.size()); | 1133 EXPECT_EQ(0U, sync_profiles.size()); |
| 1134 for (size_t i = 0; i < sync_entries.size(); i++) { | 1134 for (size_t i = 0; i < sync_entries.size(); i++) { |
| 1135 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() | 1135 DVLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name() |
| 1136 << ", " << sync_entries[i].key().value(); | 1136 << ", " << sync_entries[i].key().value(); |
| 1137 } | 1137 } |
| 1138 } | 1138 } |
| OLD | NEW |