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

Side by Side Diff: chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/macros.h" 7 #include "base/macros.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 controller_.reset([[AppMenuController alloc] initWithBrowser:browser()]); 76 controller_.reset([[AppMenuController alloc] initWithBrowser:browser()]);
77 fake_model_.reset(new MockAppMenuModel); 77 fake_model_.reset(new MockAppMenuModel);
78 78
79 sync_prefs_.reset(new sync_driver::SyncPrefs(profile()->GetPrefs())); 79 sync_prefs_.reset(new sync_driver::SyncPrefs(profile()->GetPrefs()));
80 manager_.reset(new browser_sync::SessionsSyncManager( 80 manager_.reset(new browser_sync::SessionsSyncManager(
81 ProfileSyncServiceFactory::GetForProfile(profile()) 81 ProfileSyncServiceFactory::GetForProfile(profile())
82 ->GetSyncClient() 82 ->GetSyncClient()
83 ->GetSyncSessionsClient(), 83 ->GetSyncSessionsClient(),
84 sync_prefs_.get(), local_device_.get(), 84 sync_prefs_.get(), local_device_.get(),
85 scoped_ptr<browser_sync::LocalSessionEventRouter>(new DummyRouter()), 85 std::unique_ptr<browser_sync::LocalSessionEventRouter>(
86 new DummyRouter()),
86 base::Closure(), base::Closure())); 87 base::Closure(), base::Closure()));
87 manager_->MergeDataAndStartSyncing( 88 manager_->MergeDataAndStartSyncing(
88 syncer::SESSIONS, 89 syncer::SESSIONS, syncer::SyncDataList(),
89 syncer::SyncDataList(), 90 std::unique_ptr<syncer::SyncChangeProcessor>(
90 scoped_ptr<syncer::SyncChangeProcessor>(
91 new syncer::FakeSyncChangeProcessor), 91 new syncer::FakeSyncChangeProcessor),
92 scoped_ptr<syncer::SyncErrorFactory>( 92 std::unique_ptr<syncer::SyncErrorFactory>(
93 new syncer::SyncErrorFactoryMock)); 93 new syncer::SyncErrorFactoryMock));
94 } 94 }
95 95
96 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { 96 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) {
97 helper->ExportToSessionsSyncManager(manager_.get()); 97 helper->ExportToSessionsSyncManager(manager_.get());
98 } 98 }
99 99
100 sync_driver::OpenTabsUIDelegate* GetOpenTabsDelegate() { 100 sync_driver::OpenTabsUIDelegate* GetOpenTabsDelegate() {
101 return manager_.get(); 101 return manager_.get();
102 } 102 }
103 103
104 void TearDown() override { 104 void TearDown() override {
105 fake_model_.reset(); 105 fake_model_.reset();
106 controller_.reset(); 106 controller_.reset();
107 manager_.reset(); 107 manager_.reset();
108 CocoaProfileTest::TearDown(); 108 CocoaProfileTest::TearDown();
109 } 109 }
110 110
111 AppMenuController* controller() { 111 AppMenuController* controller() {
112 return controller_.get(); 112 return controller_.get();
113 } 113 }
114 114
115 base::scoped_nsobject<AppMenuController> controller_; 115 base::scoped_nsobject<AppMenuController> controller_;
116 116
117 scoped_ptr<MockAppMenuModel> fake_model_; 117 std::unique_ptr<MockAppMenuModel> fake_model_;
118 118
119 private: 119 private:
120 scoped_ptr<sync_driver::SyncPrefs> sync_prefs_; 120 std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
121 scoped_ptr<browser_sync::SessionsSyncManager> manager_; 121 std::unique_ptr<browser_sync::SessionsSyncManager> manager_;
122 scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_; 122 std::unique_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
123 }; 123 };
124 124
125 TEST_F(AppMenuControllerTest, Initialized) { 125 TEST_F(AppMenuControllerTest, Initialized) {
126 EXPECT_TRUE([controller() menu]); 126 EXPECT_TRUE([controller() menu]);
127 EXPECT_GE([[controller() menu] numberOfItems], 5); 127 EXPECT_GE([[controller() menu] numberOfItems], 5);
128 } 128 }
129 129
130 TEST_F(AppMenuControllerTest, DispatchSimple) { 130 TEST_F(AppMenuControllerTest, DispatchSimple) {
131 base::scoped_nsobject<NSButton> button([[NSButton alloc] init]); 131 base::scoped_nsobject<NSButton> button([[NSButton alloc] init]);
132 [button setTag:IDC_ZOOM_PLUS]; 132 [button setTag:IDC_ZOOM_PLUS];
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 BrowserRemovedObserver observer; 263 BrowserRemovedObserver observer;
264 // This is normally called by ToolbarController, but since |controller_| is 264 // This is normally called by ToolbarController, but since |controller_| is
265 // not owned by one, call it here. 265 // not owned by one, call it here.
266 [controller_ browserWillBeDestroyed]; 266 [controller_ browserWillBeDestroyed];
267 CloseBrowserWindow(); 267 CloseBrowserWindow();
268 observer.WaitUntilBrowserRemoved(); 268 observer.WaitUntilBrowserRemoved();
269 // |controller_| is released in TearDown(). 269 // |controller_| is released in TearDown().
270 } 270 }
271 271
272 } // namespace 272 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698