| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/sync_sessions/sessions_sync_manager.h" | 5 #include "components/sync_sessions/sessions_sync_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 const variations::VariationID kVariationId1 = 3300200; | 817 const variations::VariationID kVariationId1 = 3300200; |
| 818 const variations::VariationID kVariationId2 = 3300300; | 818 const variations::VariationID kVariationId2 = 3300300; |
| 819 const variations::VariationID kVariationId3 = 3300400; | 819 const variations::VariationID kVariationId3 = 3300400; |
| 820 | 820 |
| 821 base::FieldTrialList field_trial_list(NULL); | 821 base::FieldTrialList field_trial_list(NULL); |
| 822 CreateAndActivateFieldTrial("trial name 1", "group name", kVariationId1, | 822 CreateAndActivateFieldTrial("trial name 1", "group name", kVariationId1, |
| 823 variations::CHROME_SYNC_SERVICE); | 823 variations::CHROME_SYNC_SERVICE); |
| 824 CreateAndActivateFieldTrial("trial name 2", "group name", kVariationId2, | 824 CreateAndActivateFieldTrial("trial name 2", "group name", kVariationId2, |
| 825 variations::CHROME_SYNC_SERVICE); | 825 variations::CHROME_SYNC_SERVICE); |
| 826 CreateAndActivateFieldTrial("trial name 3", "group name", kVariationId3, | 826 CreateAndActivateFieldTrial("trial name 3", "group name", kVariationId3, |
| 827 variations::GOOGLE_UPDATE_SERVICE); | 827 variations::GOOGLE_WEB_PROPERTIES); |
| 828 | 828 |
| 829 sessions::SessionTab session_tab; | 829 sessions::SessionTab session_tab; |
| 830 manager()->SetVariationIds(&session_tab); | 830 manager()->SetVariationIds(&session_tab); |
| 831 | 831 |
| 832 ASSERT_EQ(2u, session_tab.variation_ids.size()); | 832 ASSERT_EQ(2u, session_tab.variation_ids.size()); |
| 833 EXPECT_EQ(kVariationId1, session_tab.variation_ids[0]); | 833 EXPECT_EQ(kVariationId1, session_tab.variation_ids[0]); |
| 834 EXPECT_EQ(kVariationId2, session_tab.variation_ids[1]); | 834 EXPECT_EQ(kVariationId2, session_tab.variation_ids[1]); |
| 835 } | 835 } |
| 836 | 836 |
| 837 // Tests that for supervised users blocked navigations are recorded and marked | 837 // Tests that for supervised users blocked navigations are recorded and marked |
| (...skipping 1766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2604 base::Time last_time; | 2604 base::Time last_time; |
| 2605 for (size_t i = 0; i < tabs.size(); ++i) { | 2605 for (size_t i = 0; i < tabs.size(); ++i) { |
| 2606 base::Time this_time = tabs[i]->timestamp; | 2606 base::Time this_time = tabs[i]->timestamp; |
| 2607 if (i > 0) | 2607 if (i > 0) |
| 2608 ASSERT_GE(last_time, this_time); | 2608 ASSERT_GE(last_time, this_time); |
| 2609 last_time = tabs[i]->timestamp; | 2609 last_time = tabs[i]->timestamp; |
| 2610 } | 2610 } |
| 2611 } | 2611 } |
| 2612 | 2612 |
| 2613 } // namespace sync_sessions | 2613 } // namespace sync_sessions |
| OLD | NEW |