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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
index 1191d18370f609a7cb17c6668870c822021873ac..d1e73157802bab6b4ef2f7be83189565a6af09de 100644
--- a/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm
@@ -82,14 +82,14 @@ class AppMenuControllerTest : public CocoaProfileTest {
->GetSyncClient()
->GetSyncSessionsClient(),
sync_prefs_.get(), local_device_.get(),
- scoped_ptr<browser_sync::LocalSessionEventRouter>(new DummyRouter()),
+ std::unique_ptr<browser_sync::LocalSessionEventRouter>(
+ new DummyRouter()),
base::Closure(), base::Closure()));
manager_->MergeDataAndStartSyncing(
- syncer::SESSIONS,
- syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(
+ syncer::SESSIONS, syncer::SyncDataList(),
+ std::unique_ptr<syncer::SyncChangeProcessor>(
new syncer::FakeSyncChangeProcessor),
- scoped_ptr<syncer::SyncErrorFactory>(
+ std::unique_ptr<syncer::SyncErrorFactory>(
new syncer::SyncErrorFactoryMock));
}
@@ -114,12 +114,12 @@ class AppMenuControllerTest : public CocoaProfileTest {
base::scoped_nsobject<AppMenuController> controller_;
- scoped_ptr<MockAppMenuModel> fake_model_;
+ std::unique_ptr<MockAppMenuModel> fake_model_;
private:
- scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;
- scoped_ptr<browser_sync::SessionsSyncManager> manager_;
- scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
+ std::unique_ptr<sync_driver::SyncPrefs> sync_prefs_;
+ std::unique_ptr<browser_sync::SessionsSyncManager> manager_;
+ std::unique_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
};
TEST_F(AppMenuControllerTest, Initialized) {

Powered by Google App Engine
This is Rietveld 408576698