chrome/browser/chromeos/settings/device_settings_provider_unittest.cc - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/settings/device_settings_provider_unittest.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: 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

« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_provider.cc ('k') | chrome/browser/chromeos/settings/device_settings_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

index 052f80b91e6c3c5b3a6cac28341136cb762f9c3a..e028dd84160130ea1d46c17b855d81de545b1192 100644

--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

@@ -195,7 +195,7 @@ class DeviceSettingsProviderTest : public DeviceSettingsTestBase {

ScopedTestingLocalState local_state_;

- scoped_ptr<DeviceSettingsProvider> provider_;

+ std::unique_ptr<DeviceSettingsProvider> provider_;

base::ScopedPathOverride user_data_dir_override_;

@@ -394,7 +394,8 @@ TEST_F(DeviceSettingsProviderTest, LegacyDeviceLocalAccounts) {

// On load, the deprecated spec should have been converted to the new format.

base::ListValue expected_accounts;

- scoped_ptr<base::DictionaryValue> entry_dict(new base::DictionaryValue());

+ std::unique_ptr<base::DictionaryValue> entry_dict(

+ new base::DictionaryValue());

entry_dict->SetString(kAccountsPrefDeviceLocalAccountsKeyId,

policy::PolicyBuilder::kFakeUsername);

entry_dict->SetInteger(kAccountsPrefDeviceLocalAccountsKeyType,