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

Side by Side Diff: third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.cc

Issue 1911823002: Convert //third_party from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cacheinvalidation 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "minidump/minidump_crashpad_info_writer.h"
16
17 #include <utility> 15 #include <utility>
18 16
19 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/memory/ptr_util.h"
19 #include "minidump/minidump_crashpad_info_writer.h"
20 #include "minidump/minidump_module_crashpad_info_writer.h" 20 #include "minidump/minidump_module_crashpad_info_writer.h"
21 #include "minidump/minidump_simple_string_dictionary_writer.h" 21 #include "minidump/minidump_simple_string_dictionary_writer.h"
22 #include "snapshot/process_snapshot.h" 22 #include "snapshot/process_snapshot.h"
23 #include "util/file/file_writer.h" 23 #include "util/file/file_writer.h"
24 24
25 namespace crashpad { 25 namespace crashpad {
26 26
27 MinidumpCrashpadInfoWriter::MinidumpCrashpadInfoWriter() 27 MinidumpCrashpadInfoWriter::MinidumpCrashpadInfoWriter()
28 : MinidumpStreamWriter(), 28 : MinidumpStreamWriter(),
29 crashpad_info_(), 29 crashpad_info_(),
(...skipping 12 matching lines...) Expand all
42 42
43 UUID report_id; 43 UUID report_id;
44 process_snapshot->ReportID(&report_id); 44 process_snapshot->ReportID(&report_id);
45 SetReportID(report_id); 45 SetReportID(report_id);
46 46
47 UUID client_id; 47 UUID client_id;
48 process_snapshot->ClientID(&client_id); 48 process_snapshot->ClientID(&client_id);
49 SetClientID(client_id); 49 SetClientID(client_id);
50 50
51 auto simple_annotations = 51 auto simple_annotations =
52 make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter()); 52 base::WrapUnique(new MinidumpSimpleStringDictionaryWriter());
53 simple_annotations->InitializeFromMap( 53 simple_annotations->InitializeFromMap(
54 process_snapshot->AnnotationsSimpleMap()); 54 process_snapshot->AnnotationsSimpleMap());
55 if (simple_annotations->IsUseful()) { 55 if (simple_annotations->IsUseful()) {
56 SetSimpleAnnotations(std::move(simple_annotations)); 56 SetSimpleAnnotations(std::move(simple_annotations));
57 } 57 }
58 58
59 auto modules = make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter()); 59 auto modules = base::WrapUnique(new MinidumpModuleCrashpadInfoListWriter());
60 modules->InitializeFromSnapshot(process_snapshot->Modules()); 60 modules->InitializeFromSnapshot(process_snapshot->Modules());
61 61
62 if (modules->IsUseful()) { 62 if (modules->IsUseful()) {
63 SetModuleList(std::move(modules)); 63 SetModuleList(std::move(modules));
64 } 64 }
65 } 65 }
66 66
67 void MinidumpCrashpadInfoWriter::SetReportID(const UUID& report_id) { 67 void MinidumpCrashpadInfoWriter::SetReportID(const UUID& report_id) {
68 DCHECK_EQ(state(), kStateMutable); 68 DCHECK_EQ(state(), kStateMutable);
69 69
70 crashpad_info_.report_id = report_id; 70 crashpad_info_.report_id = report_id;
71 } 71 }
72 72
73 void MinidumpCrashpadInfoWriter::SetClientID(const UUID& client_id) { 73 void MinidumpCrashpadInfoWriter::SetClientID(const UUID& client_id) {
74 DCHECK_EQ(state(), kStateMutable); 74 DCHECK_EQ(state(), kStateMutable);
75 75
76 crashpad_info_.client_id = client_id; 76 crashpad_info_.client_id = client_id;
77 } 77 }
78 78
79 void MinidumpCrashpadInfoWriter::SetSimpleAnnotations( 79 void MinidumpCrashpadInfoWriter::SetSimpleAnnotations(
80 scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) { 80 std::unique_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
81 DCHECK_EQ(state(), kStateMutable); 81 DCHECK_EQ(state(), kStateMutable);
82 82
83 simple_annotations_ = std::move(simple_annotations); 83 simple_annotations_ = std::move(simple_annotations);
84 } 84 }
85 85
86 void MinidumpCrashpadInfoWriter::SetModuleList( 86 void MinidumpCrashpadInfoWriter::SetModuleList(
87 scoped_ptr<MinidumpModuleCrashpadInfoListWriter> module_list) { 87 std::unique_ptr<MinidumpModuleCrashpadInfoListWriter> module_list) {
88 DCHECK_EQ(state(), kStateMutable); 88 DCHECK_EQ(state(), kStateMutable);
89 89
90 module_list_ = std::move(module_list); 90 module_list_ = std::move(module_list);
91 } 91 }
92 92
93 bool MinidumpCrashpadInfoWriter::Freeze() { 93 bool MinidumpCrashpadInfoWriter::Freeze() {
94 DCHECK_EQ(state(), kStateMutable); 94 DCHECK_EQ(state(), kStateMutable);
95 95
96 if (!MinidumpStreamWriter::Freeze()) { 96 if (!MinidumpStreamWriter::Freeze()) {
97 return false; 97 return false;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 } 140 }
141 141
142 bool MinidumpCrashpadInfoWriter::IsUseful() const { 142 bool MinidumpCrashpadInfoWriter::IsUseful() const {
143 return crashpad_info_.report_id != UUID() || 143 return crashpad_info_.report_id != UUID() ||
144 crashpad_info_.client_id != UUID() || 144 crashpad_info_.client_id != UUID() ||
145 simple_annotations_ || 145 simple_annotations_ ||
146 module_list_; 146 module_list_;
147 } 147 }
148 148
149 } // namespace crashpad 149 } // namespace crashpad
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698