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

Unified Diff: content/browser/geolocation/wifi_data_provider_win.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/geolocation/wifi_data_provider_win.cc
diff --git a/content/browser/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc
index 7d9db588cd1a991b57167fefa000d3669a26f7ad..c5eca3d6f20298508351650a8c204bec0f14c337 100644
--- a/content/browser/geolocation/wifi_data_provider_win.cc
+++ b/content/browser/geolocation/wifi_data_provider_win.cc
@@ -155,7 +155,7 @@ int PerformQuery(HANDLE adapter_handle,
DWORD buffer_size,
DWORD* bytes_out);
bool ResizeBuffer(int requested_size,
- scoped_ptr<BYTE, base::FreeDeleter>* buffer);
+ std::unique_ptr<BYTE, base::FreeDeleter>* buffer);
// Gets the system directory and appends a trailing slash if not already
// present.
bool GetSystemDirectory(base::string16* path);
@@ -471,7 +471,7 @@ bool WindowsNdisApi::GetInterfaceDataNDIS(HANDLE adapter_handle,
WifiData::AccessPointDataSet* data) {
DCHECK(data);
- scoped_ptr<BYTE, base::FreeDeleter> buffer(
+ std::unique_ptr<BYTE, base::FreeDeleter> buffer(
static_cast<BYTE*>(malloc(oid_buffer_size_)));
if (buffer == NULL) {
return false;
@@ -601,7 +601,7 @@ int PerformQuery(HANDLE adapter_handle,
}
bool ResizeBuffer(int requested_size,
- scoped_ptr<BYTE, base::FreeDeleter>* buffer) {
+ std::unique_ptr<BYTE, base::FreeDeleter>* buffer) {
DCHECK_GT(requested_size, 0);
DCHECK(buffer);
if (requested_size > kMaximumBufferSize) {
@@ -621,7 +621,7 @@ bool GetSystemDirectory(base::string16* path) {
if (buffer_size == 0) {
return false;
}
- scoped_ptr<base::char16[]> buffer(new base::char16[buffer_size]);
+ std::unique_ptr<base::char16[]> buffer(new base::char16[buffer_size]);
// Return value excludes terminating NULL.
int characters_written = ::GetSystemDirectory(buffer.get(), buffer_size);

Powered by Google App Engine
This is Rietveld 408576698