chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc - Issue 2843813002: Remove SetWithoutPathExpansion

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/safe_browsing/incident_reporting/platform_state_store.cc

Issue 2843813002: Remove SetWithoutPathExpansion (Closed)

Patch Set: Fix CrOS Error Created 3 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/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc ('k') | chrome/browser/safe_browsing/incident_reporting/state_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc

diff --git a/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc b/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc

index 8da6f1930fb8eb3b08cadf222148041b1f68de08..813b5374519f4036721608a76512629229355dbe 100644

--- a/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc

+++ b/chrome/browser/safe_browsing/incident_reporting/platform_state_store.cc

@@ -16,6 +16,7 @@

#include "chrome/browser/safe_browsing/incident_reporting/platform_state_store.h"

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

#include "base/values.h"

#if defined(USE_PLATFORM_STATE_STORE)

@@ -115,8 +116,9 @@ void RestoreFromProtobuf(

base::DictionaryValue* type_dict = nullptr;

if (!value_dict->GetDictionaryWithoutPathExpansion(type_string,

&type_dict)) {

- type_dict = new base::DictionaryValue();

- value_dict->SetWithoutPathExpansion(type_string, type_dict);

+ value_dict->SetWithoutPathExpansion(

+ type_string, base::MakeUnique<base::DictionaryValue>());

+ value_dict->GetDictionaryWithoutPathExpansion(type_string, &type_dict);

}

RestoreOfTypeFromProtobuf(type_incidents.incidents().key_to_digest(),

type_dict);