| 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 void Stop() override {} | 115 void Stop() override {} |
| 116 }; | 116 }; |
| 117 | 117 |
| 118 } // namespace | 118 } // namespace |
| 119 | 119 |
| 120 class RecentTabsSubMenuModelTest | 120 class RecentTabsSubMenuModelTest |
| 121 : public BrowserWithTestWindowTest { | 121 : public BrowserWithTestWindowTest { |
| 122 public: | 122 public: |
| 123 RecentTabsSubMenuModelTest() | 123 RecentTabsSubMenuModelTest() |
| 124 : sync_service_(CreateProfileSyncServiceParamsForTest(&testing_profile_)), | 124 : sync_service_(CreateProfileSyncServiceParamsForTest(&testing_profile_)), |
| 125 local_device_(new sync_driver::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 sync_driver::SyncPrefs(testing_profile_.GetPrefs())); | 132 sync_prefs_.reset(new syncer::SyncPrefs(testing_profile_.GetPrefs())); |
| 133 manager_.reset(new sync_sessions::SessionsSyncManager( | 133 manager_.reset(new sync_sessions::SessionsSyncManager( |
| 134 sync_service_.GetSyncClient()->GetSyncSessionsClient(), | 134 sync_service_.GetSyncClient()->GetSyncSessionsClient(), |
| 135 sync_prefs_.get(), local_device_.get(), | 135 sync_prefs_.get(), local_device_.get(), |
| 136 std::unique_ptr<sync_sessions::LocalSessionEventRouter>( | 136 std::unique_ptr<sync_sessions::LocalSessionEventRouter>( |
| 137 new DummyRouter()), | 137 new DummyRouter()), |
| 138 base::Closure(), base::Closure())); | 138 base::Closure(), base::Closure())); |
| 139 manager_->MergeDataAndStartSyncing( | 139 manager_->MergeDataAndStartSyncing( |
| 140 syncer::SESSIONS, syncer::SyncDataList(), | 140 syncer::SESSIONS, syncer::SyncDataList(), |
| 141 std::unique_ptr<syncer::SyncChangeProcessor>( | 141 std::unique_ptr<syncer::SyncChangeProcessor>( |
| 142 new syncer::FakeSyncChangeProcessor), | 142 new syncer::FakeSyncChangeProcessor), |
| (...skipping 17 matching lines...) Expand all Loading... |
| 160 return manager_.get(); | 160 return manager_.get(); |
| 161 } | 161 } |
| 162 | 162 |
| 163 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { | 163 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { |
| 164 helper->ExportToSessionsSyncManager(manager_.get()); | 164 helper->ExportToSessionsSyncManager(manager_.get()); |
| 165 } | 165 } |
| 166 | 166 |
| 167 private: | 167 private: |
| 168 TestingProfile testing_profile_; | 168 TestingProfile testing_profile_; |
| 169 browser_sync::ProfileSyncServiceMock sync_service_; | 169 browser_sync::ProfileSyncServiceMock sync_service_; |
| 170 std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_; | 170 std::unique_ptr<syncer::SyncPrefs> sync_prefs_; |
| 171 std::unique_ptr<sync_sessions::SessionsSyncManager> manager_; | 171 std::unique_ptr<sync_sessions::SessionsSyncManager> manager_; |
| 172 std::unique_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_; | 172 std::unique_ptr<syncer::LocalDeviceInfoProviderMock> local_device_; |
| 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 |