| 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 "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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "chrome/app/chrome_command_ids.h" | 12 #include "chrome/app/chrome_command_ids.h" |
| 13 #include "chrome/browser/sessions/persistent_tab_restore_service.h" | 13 #include "chrome/browser/sessions/persistent_tab_restore_service.h" |
| 14 #include "chrome/browser/sessions/session_service.h" | 14 #include "chrome/browser/sessions/session_service.h" |
| 15 #include "chrome/browser/sessions/session_service_factory.h" | 15 #include "chrome/browser/sessions/session_service_factory.h" |
| 16 #include "chrome/browser/sessions/session_types.h" | 16 #include "chrome/browser/sessions/session_types.h" |
| 17 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 17 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 18 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h" | |
| 19 #include "chrome/browser/sync/glue/synced_session.h" | 18 #include "chrome/browser/sync/glue/synced_session.h" |
| 20 #include "chrome/browser/sync/profile_sync_service_mock.h" | 19 #include "chrome/browser/sync/profile_sync_service_mock.h" |
| 21 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 20 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
| 22 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
| 23 #include "chrome/browser/ui/browser_tabstrip.h" | 22 #include "chrome/browser/ui/browser_tabstrip.h" |
| 24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 23 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 25 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" | 24 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" |
| 26 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
| 27 #include "chrome/test/base/browser_with_test_window_test.h" | 26 #include "chrome/test/base/browser_with_test_window_test.h" |
| 28 #include "chrome/test/base/menu_model_test.h" | 27 #include "chrome/test/base/menu_model_test.h" |
| 29 #include "chrome/test/base/testing_profile.h" | 28 #include "chrome/test/base/testing_profile.h" |
| 30 #include "components/sessions/serialized_navigation_entry_test_helper.h" | 29 #include "components/sessions/serialized_navigation_entry_test_helper.h" |
| 30 #include "components/sync_driver/local_device_info_provider_mock.h" |
| 31 #include "content/public/browser/browser_thread.h" | 31 #include "content/public/browser/browser_thread.h" |
| 32 #include "content/public/test/test_utils.h" | 32 #include "content/public/test/test_utils.h" |
| 33 #include "grit/generated_resources.h" | 33 #include "grit/generated_resources.h" |
| 34 #include "sync/api/fake_sync_change_processor.h" | 34 #include "sync/api/fake_sync_change_processor.h" |
| 35 #include "sync/api/sync_error_factory_mock.h" | 35 #include "sync/api/sync_error_factory_mock.h" |
| 36 #include "testing/gmock/include/gmock/gmock.h" | 36 #include "testing/gmock/include/gmock/gmock.h" |
| 37 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
| 38 | 38 |
| 39 namespace { | 39 namespace { |
| 40 | 40 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 virtual void Stop() OVERRIDE {} | 111 virtual void Stop() OVERRIDE {} |
| 112 }; | 112 }; |
| 113 | 113 |
| 114 } // namespace | 114 } // namespace |
| 115 | 115 |
| 116 class RecentTabsSubMenuModelTest | 116 class RecentTabsSubMenuModelTest |
| 117 : public BrowserWithTestWindowTest { | 117 : public BrowserWithTestWindowTest { |
| 118 public: | 118 public: |
| 119 RecentTabsSubMenuModelTest() | 119 RecentTabsSubMenuModelTest() |
| 120 : sync_service_(&testing_profile_), | 120 : sync_service_(&testing_profile_), |
| 121 local_device_(new browser_sync::LocalDeviceInfoProviderMock( | 121 local_device_(new sync_driver::LocalDeviceInfoProviderMock( |
| 122 "RecentTabsSubMenuModelTest", | 122 "RecentTabsSubMenuModelTest", |
| 123 "Test Machine", | 123 "Test Machine", |
| 124 "Chromium 10k", | 124 "Chromium 10k", |
| 125 "Chrome 10k", | 125 "Chrome 10k", |
| 126 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, | 126 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, |
| 127 "device_id")) { | 127 "device_id")) { |
| 128 manager_.reset(new browser_sync::SessionsSyncManager( | 128 manager_.reset(new browser_sync::SessionsSyncManager( |
| 129 &testing_profile_, | 129 &testing_profile_, |
| 130 local_device_.get(), | 130 local_device_.get(), |
| 131 scoped_ptr<browser_sync::LocalSessionEventRouter>( | 131 scoped_ptr<browser_sync::LocalSessionEventRouter>( |
| (...skipping 24 matching lines...) Expand all Loading... |
| 156 | 156 |
| 157 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { | 157 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { |
| 158 helper->ExportToSessionsSyncManager(manager_.get()); | 158 helper->ExportToSessionsSyncManager(manager_.get()); |
| 159 } | 159 } |
| 160 | 160 |
| 161 private: | 161 private: |
| 162 TestingProfile testing_profile_; | 162 TestingProfile testing_profile_; |
| 163 testing::NiceMock<ProfileSyncServiceMock> sync_service_; | 163 testing::NiceMock<ProfileSyncServiceMock> sync_service_; |
| 164 | 164 |
| 165 scoped_ptr<browser_sync::SessionsSyncManager> manager_; | 165 scoped_ptr<browser_sync::SessionsSyncManager> manager_; |
| 166 scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_; | 166 scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_; |
| 167 }; | 167 }; |
| 168 | 168 |
| 169 // Test disabled "Recently closed" header with no foreign tabs. | 169 // Test disabled "Recently closed" header with no foreign tabs. |
| 170 TEST_F(RecentTabsSubMenuModelTest, NoTabs) { | 170 TEST_F(RecentTabsSubMenuModelTest, NoTabs) { |
| 171 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); | 171 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); |
| 172 | 172 |
| 173 // Expected menu: | 173 // Expected menu: |
| 174 // Menu index Menu items | 174 // Menu index Menu items |
| 175 // --------------------------------------------- | 175 // --------------------------------------------- |
| 176 // 0 Recently closed header (disabled) | 176 // 0 Recently closed header (disabled) |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 // 0 Recently closed heaer (disabled) | 554 // 0 Recently closed heaer (disabled) |
| 555 // 1 <separator> | 555 // 1 <separator> |
| 556 // 2 No tabs from other Devices | 556 // 2 No tabs from other Devices |
| 557 | 557 |
| 558 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); | 558 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); |
| 559 EXPECT_EQ(3, model.GetItemCount()); | 559 EXPECT_EQ(3, model.GetItemCount()); |
| 560 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0)); | 560 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0)); |
| 561 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1)); | 561 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1)); |
| 562 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); | 562 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); |
| 563 } | 563 } |
| OLD | NEW |