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

Side by Side Diff: chrome/browser/safe_browsing/incident_reporting/environment_data_collection_win.cc

Issue 1870003002: Convert //chrome/browser/safe_browsing from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and address comments 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 Chromium Authors. All rights reserved. 1 // Copyright 2014 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/safe_browsing/incident_reporting/environment_data_colle ction_win.h" 5 #include "chrome/browser/safe_browsing/incident_reporting/environment_data_colle ction_win.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory>
9 #include <set> 10 #include <set>
10 #include <string> 11 #include <string>
11 12
12 #include "base/i18n/case_conversion.h" 13 #include "base/i18n/case_conversion.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/metrics/histogram_macros.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
18 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "base/win/registry.h" 20 #include "base/win/registry.h"
21 #include "base/win/win_util.h" 21 #include "base/win/win_util.h"
22 #include "chrome/browser/install_verification/win/module_info.h" 22 #include "chrome/browser/install_verification/win/module_info.h"
23 #include "chrome/browser/install_verification/win/module_verification_common.h" 23 #include "chrome/browser/install_verification/win/module_verification_common.h"
24 #include "chrome/browser/net/service_providers_win.h" 24 #include "chrome/browser/net/service_providers_win.h"
25 #include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verif ier_win.h" 25 #include "chrome/browser/safe_browsing/incident_reporting/module_integrity_verif ier_win.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 247 }
248 248
249 void CollectModuleVerificationData( 249 void CollectModuleVerificationData(
250 const wchar_t* const modules_to_verify[], 250 const wchar_t* const modules_to_verify[],
251 size_t num_modules_to_verify, 251 size_t num_modules_to_verify,
252 ClientIncidentReport_EnvironmentData_Process* process) { 252 ClientIncidentReport_EnvironmentData_Process* process) {
253 #if !defined(_WIN64) 253 #if !defined(_WIN64)
254 using ModuleState = ClientIncidentReport_EnvironmentData_Process_ModuleState; 254 using ModuleState = ClientIncidentReport_EnvironmentData_Process_ModuleState;
255 255
256 for (size_t i = 0; i < num_modules_to_verify; ++i) { 256 for (size_t i = 0; i < num_modules_to_verify; ++i) {
257 scoped_ptr<ModuleState> module_state(new ModuleState()); 257 std::unique_ptr<ModuleState> module_state(new ModuleState());
258 258
259 int num_bytes_different = 0; 259 int num_bytes_different = 0;
260 bool scan_complete = VerifyModule(modules_to_verify[i], 260 bool scan_complete = VerifyModule(modules_to_verify[i],
261 module_state.get(), 261 module_state.get(),
262 &num_bytes_different); 262 &num_bytes_different);
263 263
264 if (module_state->modified_state() == ModuleState::MODULE_STATE_UNMODIFIED) 264 if (module_state->modified_state() == ModuleState::MODULE_STATE_UNMODIFIED)
265 continue; 265 continue;
266 266
267 if (module_state->modified_state() == ModuleState::MODULE_STATE_MODIFIED) { 267 if (module_state->modified_state() == ModuleState::MODULE_STATE_MODIFIED) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 void CollectPlatformOSData(ClientIncidentReport_EnvironmentData_OS* os_data) { 319 void CollectPlatformOSData(ClientIncidentReport_EnvironmentData_OS* os_data) {
320 const std::string reg_data_param_value = variations::GetVariationParamValue( 320 const std::string reg_data_param_value = variations::GetVariationParamValue(
321 "SafeBrowsingIncidentReportingService", "collect_reg_data"); 321 "SafeBrowsingIncidentReportingService", "collect_reg_data");
322 if (reg_data_param_value == "true") { 322 if (reg_data_param_value == "true") {
323 CollectRegistryData(kRegKeysToCollect, arraysize(kRegKeysToCollect), 323 CollectRegistryData(kRegKeysToCollect, arraysize(kRegKeysToCollect),
324 os_data->mutable_registry_key()); 324 os_data->mutable_registry_key());
325 } 325 }
326 CollectDomainEnrollmentData(os_data); 326 CollectDomainEnrollmentData(os_data);
327 } 327 }
328 } // namespace safe_browsing 328 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698