| 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 "sync/internal_api/js_mutation_event_observer.h" | 5 #include "sync/internal_api/js_mutation_event_observer.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "sync/internal_api/public/base/model_type.h" | 10 #include "sync/internal_api/public/base/model_type.h" |
| 11 #include "sync/internal_api/public/util/weak_handle.h" | 11 #include "sync/internal_api/public/util/weak_handle.h" |
| 12 #include "sync/js/js_event_details.h" | 12 #include "sync/js/js_event_details.h" |
| 13 #include "sync/js/js_test_util.h" | 13 #include "sync/js/js_test_util.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 namespace { | 17 namespace { |
| 18 | 18 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 29 private: | 29 private: |
| 30 // This must be destroyed after the member variables below in order | 30 // This must be destroyed after the member variables below in order |
| 31 // for WeakHandles to be destroyed properly. | 31 // for WeakHandles to be destroyed properly. |
| 32 base::MessageLoop message_loop_; | 32 base::MessageLoop message_loop_; |
| 33 | 33 |
| 34 protected: | 34 protected: |
| 35 StrictMock<MockJsEventHandler> mock_js_event_handler_; | 35 StrictMock<MockJsEventHandler> mock_js_event_handler_; |
| 36 JsMutationEventObserver js_mutation_event_observer_; | 36 JsMutationEventObserver js_mutation_event_observer_; |
| 37 | 37 |
| 38 void PumpLoop() { | 38 void PumpLoop() { |
| 39 message_loop_.RunUntilIdle(); | 39 base::RunLoop().RunUntilIdle(); |
| 40 } | 40 } |
| 41 }; | 41 }; |
| 42 | 42 |
| 43 TEST_F(JsMutationEventObserverTest, OnChangesApplied) { | 43 TEST_F(JsMutationEventObserverTest, OnChangesApplied) { |
| 44 InSequence dummy; | 44 InSequence dummy; |
| 45 | 45 |
| 46 // We don't test with passwords as that requires additional setup. | 46 // We don't test with passwords as that requires additional setup. |
| 47 | 47 |
| 48 // Build a list of example ChangeRecords. | 48 // Build a list of example ChangeRecords. |
| 49 ChangeRecord changes[MODEL_TYPE_COUNT]; | 49 ChangeRecord changes[MODEL_TYPE_COUNT]; |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 | 109 |
| 110 for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) { | 110 for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) { |
| 111 js_mutation_event_observer_.OnChangesComplete( | 111 js_mutation_event_observer_.OnChangesComplete( |
| 112 ModelTypeFromInt(i)); | 112 ModelTypeFromInt(i)); |
| 113 } | 113 } |
| 114 PumpLoop(); | 114 PumpLoop(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 } // namespace | 117 } // namespace |
| 118 } // namespace syncer | 118 } // namespace syncer |
| OLD | NEW |