chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc - Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry

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/policy/user_cloud_policy_store_chromeos_unittest.cc

Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: another-fix Created 4 years, 7 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/policy/user_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

index e0be098be8ab3ec07735afd1e6fa6b03ff6df2d6..56faef425c6d0fbf8e5b4256ad31f02298a43ea7 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

@@ -13,6 +13,7 @@

#include "base/files/file_util.h"

#include "base/files/scoped_temp_dir.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/message_loop/message_loop.h"

#include "base/threading/sequenced_worker_pool.h"

#include "chromeos/dbus/mock_cryptohome_client.h"

@@ -118,7 +119,7 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test {

const PolicyMap::Entry* entry =

store_->policy_map().Get(key::kHomepageLocation);

ASSERT_TRUE(entry);

- EXPECT_TRUE(base::StringValue(expected_value).Equals(entry->value));

+ EXPECT_TRUE(base::StringValue(expected_value).Equals(entry->value.get()));

}

void StoreUserPolicyKey(const std::vector<uint8_t>& public_key) {

@@ -152,11 +153,10 @@ class UserCloudPolicyStoreChromeOSTest : public testing::Test {

PolicyMap previous_policy;

EXPECT_EQ(previous_value != NULL, store_->policy() != NULL);

if (previous_value) {

- previous_policy.Set(key::kHomepageLocation,

- POLICY_LEVEL_MANDATORY,

- POLICY_SCOPE_USER,

- POLICY_SOURCE_CLOUD,

- new base::StringValue(previous_value), NULL);

+ previous_policy.Set(

+ key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,

+ POLICY_SOURCE_CLOUD,

+ base::WrapUnique(new base::StringValue(previous_value)), nullptr);

}

EXPECT_TRUE(previous_policy.Equals(store_->policy_map()));

EXPECT_EQ(CloudPolicyStore::STATUS_OK, store_->status());