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

Side by Side Diff: chrome/browser/permissions/permission_decision_auto_blocker.cc

Issue 2334613003: Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Patch Set: Changes from review by sky Created 4 years, 3 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/permissions/permission_decision_auto_blocker.h" 5 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/feature_list.h" 9 #include "base/feature_list.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 16 matching lines...) Expand all
27 27
28 std::unique_ptr<base::DictionaryValue> GetOriginDict( 28 std::unique_ptr<base::DictionaryValue> GetOriginDict(
29 HostContentSettingsMap* settings, 29 HostContentSettingsMap* settings,
30 const GURL& origin_url) { 30 const GURL& origin_url) {
31 std::unique_ptr<base::DictionaryValue> dict = 31 std::unique_ptr<base::DictionaryValue> dict =
32 base::DictionaryValue::From(settings->GetWebsiteSetting( 32 base::DictionaryValue::From(settings->GetWebsiteSetting(
33 origin_url, origin_url, 33 origin_url, origin_url,
34 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, std::string(), 34 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, std::string(),
35 nullptr)); 35 nullptr));
36 if (!dict) 36 if (!dict)
37 return base::WrapUnique(new base::DictionaryValue()); 37 return base::MakeUnique<base::DictionaryValue>();
38 38
39 return dict; 39 return dict;
40 } 40 }
41 41
42 base::DictionaryValue* GetOrCreatePermissionDict( 42 base::DictionaryValue* GetOrCreatePermissionDict(
43 base::DictionaryValue* origin_dict, 43 base::DictionaryValue* origin_dict,
44 const std::string& permission) { 44 const std::string& permission) {
45 base::DictionaryValue* permission_dict = nullptr; 45 base::DictionaryValue* permission_dict = nullptr;
46 if (!origin_dict->GetDictionaryWithoutPathExpansion(permission, 46 if (!origin_dict->GetDictionaryWithoutPathExpansion(permission,
47 &permission_dict)) { 47 &permission_dict)) {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 void PermissionDecisionAutoBlocker::UpdateFromVariations() { 168 void PermissionDecisionAutoBlocker::UpdateFromVariations() {
169 int prompt_dismissals = -1; 169 int prompt_dismissals = -1;
170 std::string value = variations::GetVariationParamValueByFeature( 170 std::string value = variations::GetVariationParamValueByFeature(
171 features::kBlockPromptsIfDismissedOften, kPromptDismissCountKey); 171 features::kBlockPromptsIfDismissedOften, kPromptDismissCountKey);
172 172
173 // If converting the value fails, stick with the default value. 173 // If converting the value fails, stick with the default value.
174 if (base::StringToInt(value, &prompt_dismissals) && prompt_dismissals > 0) 174 if (base::StringToInt(value, &prompt_dismissals) && prompt_dismissals > 0)
175 prompt_dismissals_before_block_ = prompt_dismissals; 175 prompt_dismissals_before_block_ = prompt_dismissals;
176 } 176 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/delegation_tracker.cc ('k') | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698