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

Unified Diff: webrtc/base/win32regkey.cc

Issue 1837693002: Remove calls to rtc::scoped_ptr::accept (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@using-3
Patch Set: rebase Created 4 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/win32regkey.cc
diff --git a/webrtc/base/win32regkey.cc b/webrtc/base/win32regkey.cc
index ccf931c14a37a7d5a2499fc120890037139d07bf..c53386fffe4e8e9090f099e68f829964337f38b4 100644
--- a/webrtc/base/win32regkey.cc
+++ b/webrtc/base/win32regkey.cc
@@ -143,9 +143,10 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name,
ASSERT(full_key_name != NULL);
DWORD byte_count = 0;
- scoped_ptr<byte[]> buffer;
+ byte* buffer_raw = nullptr;
HRESULT hr = GetValueStaticHelper(full_key_name, value_name,
- REG_BINARY, buffer.accept(), &byte_count);
+ REG_BINARY, &buffer_raw, &byte_count);
+ scoped_ptr<byte[]> buffer(buffer_raw);
if (SUCCEEDED(hr)) {
ASSERT(byte_count == sizeof(*value));
if (byte_count == sizeof(*value)) {
@@ -162,9 +163,10 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name,
ASSERT(full_key_name != NULL);
DWORD byte_count = 0;
- scoped_ptr<byte[]> buffer;
+ byte* buffer_raw = nullptr;
HRESULT hr = GetValueStaticHelper(full_key_name, value_name,
- REG_BINARY, buffer.accept(), &byte_count);
+ REG_BINARY, &buffer_raw, &byte_count);
+ scoped_ptr<byte[]> buffer(buffer_raw);
if (SUCCEEDED(hr)) {
ASSERT(byte_count == sizeof(*value));
if (byte_count == sizeof(*value)) {
@@ -189,8 +191,9 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name,
ASSERT(full_key_name != NULL);
ASSERT(value != NULL);
- scoped_ptr<wchar_t[]> buffer;
- HRESULT hr = RegKey::GetValue(full_key_name, value_name, buffer.accept());
+ wchar_t* buffer_raw = nullptr;
+ HRESULT hr = RegKey::GetValue(full_key_name, value_name, &buffer_raw);
+ scoped_ptr<wchar_t[]> buffer(buffer_raw);
if (SUCCEEDED(hr)) {
value->assign(buffer.get());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698