OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
123 RecentTabsSubMenuModelTest() | 123 RecentTabsSubMenuModelTest() |
124 : sync_service_(CreateProfileSyncServiceParamsForTest(&testing_profile_)), | 124 : sync_service_(CreateProfileSyncServiceParamsForTest(&testing_profile_)), |
125 local_device_(new syncer::LocalDeviceInfoProviderMock( | 125 local_device_(new syncer::LocalDeviceInfoProviderMock( |
126 "RecentTabsSubMenuModelTest", | 126 "RecentTabsSubMenuModelTest", |
127 "Test Machine", | 127 "Test Machine", |
128 "Chromium 10k", | 128 "Chromium 10k", |
129 "Chrome 10k", | 129 "Chrome 10k", |
130 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, | 130 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, |
131 "device_id")) { | 131 "device_id")) { |
132 sync_prefs_.reset(new syncer::SyncPrefs(testing_profile_.GetPrefs())); | 132 sync_prefs_.reset(new syncer::SyncPrefs(testing_profile_.GetPrefs())); |
133 dummy_router_.reset(new DummyRouter()); | |
Peter Kasting
2017/03/22 21:52:15
Nit: Prefer MakeUnique over bare new:
dummy_rou
Patrick Noland
2017/03/23 20:15:03
Done.
| |
133 manager_.reset(new sync_sessions::SessionsSyncManager( | 134 manager_.reset(new sync_sessions::SessionsSyncManager( |
134 sync_service_.GetSyncClient()->GetSyncSessionsClient(), | 135 sync_service_.GetSyncClient()->GetSyncSessionsClient(), |
135 sync_prefs_.get(), local_device_.get(), | 136 sync_prefs_.get(), local_device_.get(), dummy_router_.get(), |
136 std::unique_ptr<sync_sessions::LocalSessionEventRouter>( | |
137 new DummyRouter()), | |
138 base::Closure(), base::Closure())); | 137 base::Closure(), base::Closure())); |
139 manager_->MergeDataAndStartSyncing( | 138 manager_->MergeDataAndStartSyncing( |
140 syncer::SESSIONS, syncer::SyncDataList(), | 139 syncer::SESSIONS, syncer::SyncDataList(), |
141 std::unique_ptr<syncer::SyncChangeProcessor>( | 140 std::unique_ptr<syncer::SyncChangeProcessor>( |
142 new syncer::FakeSyncChangeProcessor), | 141 new syncer::FakeSyncChangeProcessor), |
143 std::unique_ptr<syncer::SyncErrorFactory>( | 142 std::unique_ptr<syncer::SyncErrorFactory>( |
144 new syncer::SyncErrorFactoryMock)); | 143 new syncer::SyncErrorFactoryMock)); |
145 } | 144 } |
146 | 145 |
147 void WaitForLoadFromLastSession() { | 146 void WaitForLoadFromLastSession() { |
(...skipping 15 matching lines...) Expand all Loading... | |
163 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { | 162 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { |
164 helper->ExportToSessionsSyncManager(manager_.get()); | 163 helper->ExportToSessionsSyncManager(manager_.get()); |
165 } | 164 } |
166 | 165 |
167 private: | 166 private: |
168 TestingProfile testing_profile_; | 167 TestingProfile testing_profile_; |
169 browser_sync::ProfileSyncServiceMock sync_service_; | 168 browser_sync::ProfileSyncServiceMock sync_service_; |
170 std::unique_ptr<syncer::SyncPrefs> sync_prefs_; | 169 std::unique_ptr<syncer::SyncPrefs> sync_prefs_; |
171 std::unique_ptr<sync_sessions::SessionsSyncManager> manager_; | 170 std::unique_ptr<sync_sessions::SessionsSyncManager> manager_; |
172 std::unique_ptr<syncer::LocalDeviceInfoProviderMock> local_device_; | 171 std::unique_ptr<syncer::LocalDeviceInfoProviderMock> local_device_; |
172 std::unique_ptr<DummyRouter> dummy_router_; | |
173 }; | 173 }; |
174 | 174 |
175 // Test disabled "Recently closed" header with no foreign tabs. | 175 // Test disabled "Recently closed" header with no foreign tabs. |
176 TEST_F(RecentTabsSubMenuModelTest, NoTabs) { | 176 TEST_F(RecentTabsSubMenuModelTest, NoTabs) { |
177 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); | 177 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); |
178 | 178 |
179 // Expected menu: | 179 // Expected menu: |
180 // Menu index Menu items | 180 // Menu index Menu items |
181 // --------------------------------------------- | 181 // --------------------------------------------- |
182 // 0 History | 182 // 0 History |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
607 // 2 Recently closed heaer (disabled) | 607 // 2 Recently closed heaer (disabled) |
608 // 3 <separator> | 608 // 3 <separator> |
609 // 4 No tabs from other Devices | 609 // 4 No tabs from other Devices |
610 | 610 |
611 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); | 611 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); |
612 EXPECT_EQ(5, model.GetItemCount()); | 612 EXPECT_EQ(5, model.GetItemCount()); |
613 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); | 613 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); |
614 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3)); | 614 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3)); |
615 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4)); | 615 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4)); |
616 } | 616 } |
OLD | NEW |