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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_test_base.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: iwyu fixes 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chromeos/login/supervised/supervised_user_test_base.h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 const char kStubEthernetGuid[] = "eth0"; 57 const char kStubEthernetGuid[] = "eth0";
58 58
59 } 59 }
60 60
61 SupervisedUsersSyncTestAdapter::SupervisedUsersSyncTestAdapter(Profile* profile) 61 SupervisedUsersSyncTestAdapter::SupervisedUsersSyncTestAdapter(Profile* profile)
62 : processor_(), next_sync_data_id_(0) { 62 : processor_(), next_sync_data_id_(0) {
63 service_ = SupervisedUserSyncServiceFactory::GetForProfile(profile); 63 service_ = SupervisedUserSyncServiceFactory::GetForProfile(profile);
64 processor_ = new syncer::FakeSyncChangeProcessor(); 64 processor_ = new syncer::FakeSyncChangeProcessor();
65 service_->MergeDataAndStartSyncing( 65 service_->MergeDataAndStartSyncing(
66 syncer::SUPERVISED_USERS, 66 syncer::SUPERVISED_USERS, syncer::SyncDataList(),
67 syncer::SyncDataList(), 67 std::unique_ptr<syncer::SyncChangeProcessor>(processor_),
68 scoped_ptr<syncer::SyncChangeProcessor>(processor_), 68 std::unique_ptr<syncer::SyncErrorFactory>(
69 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock)); 69 new syncer::SyncErrorFactoryMock));
70 } 70 }
71 71
72 scoped_ptr< ::sync_pb::ManagedUserSpecifics> 72 std::unique_ptr<::sync_pb::ManagedUserSpecifics>
73 SupervisedUsersSyncTestAdapter::GetFirstChange() { 73 SupervisedUsersSyncTestAdapter::GetFirstChange() {
74 scoped_ptr< ::sync_pb::ManagedUserSpecifics> result( 74 std::unique_ptr<::sync_pb::ManagedUserSpecifics> result(
75 new ::sync_pb::ManagedUserSpecifics); 75 new ::sync_pb::ManagedUserSpecifics);
76 CHECK(HasChanges()) 76 CHECK(HasChanges())
77 << "GetFirstChange() should only be callled if HasChanges() is true"; 77 << "GetFirstChange() should only be callled if HasChanges() is true";
78 const syncer::SyncData& data = processor_->changes().front().sync_data(); 78 const syncer::SyncData& data = processor_->changes().front().sync_data();
79 EXPECT_EQ(syncer::SUPERVISED_USERS, data.GetDataType()); 79 EXPECT_EQ(syncer::SUPERVISED_USERS, data.GetDataType());
80 result->CopyFrom(data.GetSpecifics().managed_user()); 80 result->CopyFrom(data.GetSpecifics().managed_user());
81 return result; 81 return result;
82 } 82 }
83 83
84 void SupervisedUsersSyncTestAdapter::AddChange( 84 void SupervisedUsersSyncTestAdapter::AddChange(
(...skipping 20 matching lines...) Expand all
105 service_->ProcessSyncChanges(FROM_HERE, change_list); 105 service_->ProcessSyncChanges(FROM_HERE, change_list);
106 } 106 }
107 107
108 SupervisedUsersSharedSettingsSyncTestAdapter:: 108 SupervisedUsersSharedSettingsSyncTestAdapter::
109 SupervisedUsersSharedSettingsSyncTestAdapter(Profile* profile) 109 SupervisedUsersSharedSettingsSyncTestAdapter(Profile* profile)
110 : processor_(), next_sync_data_id_(0) { 110 : processor_(), next_sync_data_id_(0) {
111 service_ = 111 service_ =
112 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(profile); 112 SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(profile);
113 processor_ = new syncer::FakeSyncChangeProcessor(); 113 processor_ = new syncer::FakeSyncChangeProcessor();
114 service_->MergeDataAndStartSyncing( 114 service_->MergeDataAndStartSyncing(
115 syncer::SUPERVISED_USER_SHARED_SETTINGS, 115 syncer::SUPERVISED_USER_SHARED_SETTINGS, syncer::SyncDataList(),
116 syncer::SyncDataList(), 116 std::unique_ptr<syncer::SyncChangeProcessor>(processor_),
117 scoped_ptr<syncer::SyncChangeProcessor>(processor_), 117 std::unique_ptr<syncer::SyncErrorFactory>(
118 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock)); 118 new syncer::SyncErrorFactoryMock));
119 } 119 }
120 120
121 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> 121 std::unique_ptr<::sync_pb::ManagedUserSharedSettingSpecifics>
122 SupervisedUsersSharedSettingsSyncTestAdapter::GetFirstChange() { 122 SupervisedUsersSharedSettingsSyncTestAdapter::GetFirstChange() {
123 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> result( 123 std::unique_ptr<::sync_pb::ManagedUserSharedSettingSpecifics> result(
124 new ::sync_pb::ManagedUserSharedSettingSpecifics); 124 new ::sync_pb::ManagedUserSharedSettingSpecifics);
125 CHECK(HasChanges()) 125 CHECK(HasChanges())
126 << "GetFirstChange() should only be callled if HasChanges() is true"; 126 << "GetFirstChange() should only be callled if HasChanges() is true";
127 const syncer::SyncData& data = processor_->changes().front().sync_data(); 127 const syncer::SyncData& data = processor_->changes().front().sync_data();
128 EXPECT_EQ(syncer::SUPERVISED_USER_SHARED_SETTINGS, data.GetDataType()); 128 EXPECT_EQ(syncer::SUPERVISED_USER_SHARED_SETTINGS, data.GetDataType());
129 result->CopyFrom(data.GetSpecifics().managed_user_shared_setting()); 129 result->CopyFrom(data.GetSpecifics().managed_user_shared_setting());
130 return result; 130 return result;
131 } 131 }
132 132
133 void SupervisedUsersSharedSettingsSyncTestAdapter::AddChange( 133 void SupervisedUsersSharedSettingsSyncTestAdapter::AddChange(
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 JSEval(StringPrintf( 440 JSEval(StringPrintf(
441 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()", 441 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()",
442 user_index)); 442 user_index));
443 443
444 // Make sure there is no supervised user in list. 444 // Make sure there is no supervised user in list.
445 ASSERT_EQ(original_user_count - 1, 445 ASSERT_EQ(original_user_count - 1,
446 user_manager::UserManager::Get()->GetUsers().size()); 446 user_manager::UserManager::Get()->GetUsers().size());
447 } 447 }
448 448
449 } // namespace chromeos 449 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698