chrome/browser/chromeos/settings/device_settings_service_unittest.cc - Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

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_service_unittest.cc

Issue 18308004: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years, 6 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_oauth2_token_service_unittest.cc ('k') | chrome/browser/chromeos/settings/session_manager_operation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 990b2bb25f0ab8975765db8245b3667c74f361ee..0864a420156a51e3f0d9092f4ac4b83649d3d67e 100644

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

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

@@ -267,7 +267,7 @@ TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {

owner_key_util_->Clear();

EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());

- EXPECT_FALSE(device_settings_service_.GetOwnerKey());

+ EXPECT_FALSE(device_settings_service_.GetOwnerKey().get());

EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,

device_settings_service_.GetOwnershipStatus());

@@ -276,7 +276,7 @@ TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {

base::Unretained(this)));

FlushDeviceSettings();

EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());

- ASSERT_TRUE(device_settings_service_.GetOwnerKey());

+ ASSERT_TRUE(device_settings_service_.GetOwnerKey().get());

EXPECT_FALSE(device_settings_service_.GetOwnerKey()->public_key());

EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key());

EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE,

@@ -291,7 +291,7 @@ TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {

base::Unretained(this)));

FlushDeviceSettings();

EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());

- ASSERT_TRUE(device_settings_service_.GetOwnerKey());

+ ASSERT_TRUE(device_settings_service_.GetOwnerKey().get());

ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());

std::vector<uint8> key;

ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key));

@@ -309,7 +309,7 @@ TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {

base::Unretained(this)));

FlushDeviceSettings();

EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());

- ASSERT_TRUE(device_settings_service_.GetOwnerKey());

+ ASSERT_TRUE(device_settings_service_.GetOwnerKey().get());

ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());

ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key));

EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);