Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Side by Side Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 401433003: Revert of Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/mac/scoped_nsobject.h" 6 #include "base/mac/scoped_nsobject.h"
7 #include "base/strings/sys_string_conversions.h" 7 #include "base/strings/sys_string_conversions.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/sync/glue/device_info.h" 10 #include "chrome/browser/sync/glue/device_info.h"
11 #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
12 #include "chrome/browser/sync/profile_sync_service_factory.h" 11 #include "chrome/browser/sync/profile_sync_service_factory.h"
13 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" 12 #include "chrome/browser/sync/sessions/sessions_sync_manager.h"
14 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 13 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
15 #include "chrome/browser/ui/cocoa/run_loop_testing.h" 14 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
16 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 15 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
17 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 16 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
18 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" 17 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
19 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" 18 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"
20 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" 19 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
21 #include "chrome/browser/ui/toolbar/wrench_menu_model.h" 20 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
(...skipping 29 matching lines...) Expand all
51 50
52 class DummyRouter : public browser_sync::LocalSessionEventRouter { 51 class DummyRouter : public browser_sync::LocalSessionEventRouter {
53 public: 52 public:
54 virtual ~DummyRouter() {} 53 virtual ~DummyRouter() {}
55 virtual void StartRoutingTo( 54 virtual void StartRoutingTo(
56 browser_sync::LocalSessionEventHandler* handler) OVERRIDE {} 55 browser_sync::LocalSessionEventHandler* handler) OVERRIDE {}
57 virtual void Stop() OVERRIDE {} 56 virtual void Stop() OVERRIDE {}
58 }; 57 };
59 58
60 class WrenchMenuControllerTest 59 class WrenchMenuControllerTest
61 : public CocoaProfileTest { 60 : public CocoaProfileTest,
61 public browser_sync::SessionsSyncManager::SyncInternalApiDelegate {
62 public: 62 public:
63 WrenchMenuControllerTest()
64 : local_device_(new browser_sync::LocalDeviceInfoProviderMock(
65 "WrenchMenuControllerTest",
66 "Test Machine",
67 "Chromium 10k",
68 "Chrome 10k",
69 sync_pb::SyncEnums_DeviceType_TYPE_LINUX)) {
70 }
71
72 virtual ~WrenchMenuControllerTest() {}
73
74 virtual void SetUp() OVERRIDE { 63 virtual void SetUp() OVERRIDE {
75 CocoaProfileTest::SetUp(); 64 CocoaProfileTest::SetUp();
76 ASSERT_TRUE(browser()); 65 ASSERT_TRUE(browser());
77 66
78 controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]); 67 controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]);
79 fake_model_.reset(new MockWrenchMenuModel); 68 fake_model_.reset(new MockWrenchMenuModel);
80 69
81 manager_.reset(new browser_sync::SessionsSyncManager( 70 manager_.reset(new browser_sync::SessionsSyncManager(
82 profile(), 71 profile(),
83 local_device_.get(), 72 this,
84 scoped_ptr<browser_sync::LocalSessionEventRouter>( 73 scoped_ptr<browser_sync::LocalSessionEventRouter>(
85 new DummyRouter()))); 74 new DummyRouter())));
86 manager_->MergeDataAndStartSyncing( 75 manager_->MergeDataAndStartSyncing(
87 syncer::SESSIONS, 76 syncer::SESSIONS,
88 syncer::SyncDataList(), 77 syncer::SyncDataList(),
89 scoped_ptr<syncer::SyncChangeProcessor>( 78 scoped_ptr<syncer::SyncChangeProcessor>(
90 new syncer::FakeSyncChangeProcessor), 79 new syncer::FakeSyncChangeProcessor),
91 scoped_ptr<syncer::SyncErrorFactory>( 80 scoped_ptr<syncer::SyncErrorFactory>(
92 new syncer::SyncErrorFactoryMock)); 81 new syncer::SyncErrorFactoryMock));
93 } 82 }
94 83
84 virtual scoped_ptr<browser_sync::DeviceInfo> GetLocalDeviceInfo()
85 const OVERRIDE {
86 return scoped_ptr<browser_sync::DeviceInfo>(
87 new browser_sync::DeviceInfo(GetLocalSyncCacheGUID(),
88 "Test Machine",
89 "Chromium 10k",
90 "Chrome 10k",
91 sync_pb::SyncEnums_DeviceType_TYPE_LINUX));
92 }
93
94 virtual std::string GetLocalSyncCacheGUID() const OVERRIDE {
95 return "WrenchMenuControllerTest";
96 }
97
95 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { 98 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
96 helper->ExportToSessionsSyncManager(manager_.get()); 99 helper->ExportToSessionsSyncManager(manager_.get());
97 } 100 }
98 101
99 browser_sync::OpenTabsUIDelegate* GetOpenTabsDelegate() { 102 browser_sync::OpenTabsUIDelegate* GetOpenTabsDelegate() {
100 return manager_.get(); 103 return manager_.get();
101 } 104 }
102 105
103 virtual void TearDown() OVERRIDE { 106 virtual void TearDown() OVERRIDE {
104 fake_model_.reset(); 107 fake_model_.reset();
105 controller_.reset(); 108 controller_.reset();
106 manager_.reset(); 109 manager_.reset();
107 CocoaProfileTest::TearDown(); 110 CocoaProfileTest::TearDown();
108 } 111 }
109 112
110 WrenchMenuController* controller() { 113 WrenchMenuController* controller() {
111 return controller_.get(); 114 return controller_.get();
112 } 115 }
113 116
114 base::scoped_nsobject<WrenchMenuController> controller_; 117 base::scoped_nsobject<WrenchMenuController> controller_;
115 118
116 scoped_ptr<MockWrenchMenuModel> fake_model_; 119 scoped_ptr<MockWrenchMenuModel> fake_model_;
117 120
118 private: 121 private:
119 scoped_ptr<browser_sync::SessionsSyncManager> manager_; 122 scoped_ptr<browser_sync::SessionsSyncManager> manager_;
120 scoped_ptr<browser_sync::LocalDeviceInfoProviderMock> local_device_;
121 }; 123 };
122 124
123 TEST_F(WrenchMenuControllerTest, Initialized) { 125 TEST_F(WrenchMenuControllerTest, Initialized) {
124 EXPECT_TRUE([controller() menu]); 126 EXPECT_TRUE([controller() menu]);
125 EXPECT_GE([[controller() menu] numberOfItems], 5); 127 EXPECT_GE([[controller() menu] numberOfItems], 5);
126 } 128 }
127 129
128 TEST_F(WrenchMenuControllerTest, DispatchSimple) { 130 TEST_F(WrenchMenuControllerTest, DispatchSimple) {
129 base::scoped_nsobject<NSButton> button([[NSButton alloc] init]); 131 base::scoped_nsobject<NSButton> button([[NSButton alloc] init]);
130 [button setTag:IDC_ZOOM_PLUS]; 132 [button setTag:IDC_ZOOM_PLUS];
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 234 }
233 235
234 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model 236 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model
235 // it's observing. 237 // it's observing.
236 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) { 238 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {
237 [controller_ menuNeedsUpdate:[controller_ menu]]; 239 [controller_ menuNeedsUpdate:[controller_ menu]];
238 // If the delete order is wrong then the test will crash on exit. 240 // If the delete order is wrong then the test will crash on exit.
239 } 241 }
240 242
241 } // namespace 243 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/sync/test_profile_sync_service.cc ('k') | chrome/browser/ui/sync/one_click_signin_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698