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

Unified Diff: content/browser/devtools/protocol/system_info_handler.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/devtools/protocol/system_info_handler.cc
diff --git a/content/browser/devtools/protocol/system_info_handler.cc b/content/browser/devtools/protocol/system_info_handler.cc
index 5a9d53ad1e90a64c76ef42a5462b150bea3f8545..2c139c422ebb905d22f2f7a6dc8713c55ff3079c 100644
--- a/content/browser/devtools/protocol/system_info_handler.cc
+++ b/content/browser/devtools/protocol/system_info_handler.cc
@@ -5,10 +5,12 @@
#include "content/browser/devtools/protocol/system_info_handler.h"
#include <stdint.h>
+
#include <utility>
#include "base/bind.h"
#include "base/command_line.h"
+#include "base/memory/ptr_util.h"
#include "content/browser/gpu/compositor_util.h"
#include "content/public/browser/gpu_data_manager.h"
#include "gpu/config/gpu_feature_type.h"
@@ -145,7 +147,7 @@ SystemInfoHandler::SystemInfoHandler()
SystemInfoHandler::~SystemInfoHandler() {
}
-void SystemInfoHandler::SetClient(scoped_ptr<Client> client) {
+void SystemInfoHandler::SetClient(std::unique_ptr<Client> client) {
client_.swap(client);
}
@@ -197,7 +199,8 @@ void SystemInfoHandler::SendGetInfoResponse(DevToolsCommandId command_id) {
for (const auto& device : gpu_info.secondary_gpus)
devices.push_back(GPUDeviceToProtocol(device));
- scoped_ptr<base::DictionaryValue> aux_attributes(new base::DictionaryValue);
+ std::unique_ptr<base::DictionaryValue> aux_attributes(
+ new base::DictionaryValue);
AuxGPUInfoEnumerator enumerator(aux_attributes.get());
gpu_info.EnumerateFields(&enumerator);
@@ -205,7 +208,7 @@ void SystemInfoHandler::SendGetInfoResponse(DevToolsCommandId command_id) {
GPUInfo::Create()
->set_devices(devices)
->set_aux_attributes(std::move(aux_attributes))
- ->set_feature_status(make_scoped_ptr(GetFeatureStatus()))
+ ->set_feature_status(base::WrapUnique(GetFeatureStatus()))
->set_driver_bug_workarounds(GetDriverBugWorkarounds());
client_->SendGetInfoResponse(
« no previous file with comments | « content/browser/devtools/protocol/system_info_handler.h ('k') | content/browser/devtools/protocol/tethering_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698