| Index: extensions/browser/api/web_request/web_request_event_details.cc
|
| diff --git a/extensions/browser/api/web_request/web_request_event_details.cc b/extensions/browser/api/web_request/web_request_event_details.cc
|
| index 8a3e87473763872143e6aea6c18fcb049d6324c7..f43b9f7d95512940ff94fbe8a8159634dce278e3 100644
|
| --- a/extensions/browser/api/web_request/web_request_event_details.cc
|
| +++ b/extensions/browser/api/web_request/web_request_event_details.cc
|
| @@ -4,7 +4,10 @@
|
|
|
| #include "extensions/browser/api/web_request/web_request_event_details.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/callback.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| @@ -126,10 +129,10 @@ void WebRequestEventDetails::SetAuthInfo(
|
| dict_.SetString(keys::kSchemeKey, auth_info.scheme);
|
| if (!auth_info.realm.empty())
|
| dict_.SetString(keys::kRealmKey, auth_info.realm);
|
| - base::DictionaryValue* challenger = new base::DictionaryValue();
|
| + auto challenger = base::MakeUnique<base::DictionaryValue>();
|
| challenger->SetString(keys::kHostKey, auth_info.challenger.host());
|
| challenger->SetInteger(keys::kPortKey, auth_info.challenger.port());
|
| - dict_.Set(keys::kChallengerKey, challenger);
|
| + dict_.Set(keys::kChallengerKey, std::move(challenger));
|
| }
|
|
|
| void WebRequestEventDetails::SetResponseHeaders(
|
| @@ -193,12 +196,19 @@ void WebRequestEventDetails::DetermineFrameDataOnIO(
|
| std::unique_ptr<base::DictionaryValue> WebRequestEventDetails::GetFilteredDict(
|
| int extra_info_spec) const {
|
| std::unique_ptr<base::DictionaryValue> result = dict_.CreateDeepCopy();
|
| - if ((extra_info_spec & ExtraInfoSpec::REQUEST_BODY) && request_body_)
|
| - result->Set(keys::kRequestBodyKey, request_body_->CreateDeepCopy());
|
| - if ((extra_info_spec & ExtraInfoSpec::REQUEST_HEADERS) && request_headers_)
|
| - result->Set(keys::kRequestHeadersKey, request_headers_->CreateDeepCopy());
|
| - if ((extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) && response_headers_)
|
| - result->Set(keys::kResponseHeadersKey, response_headers_->CreateDeepCopy());
|
| + if ((extra_info_spec & ExtraInfoSpec::REQUEST_BODY) && request_body_) {
|
| + result->Set(keys::kRequestBodyKey,
|
| + base::MakeUnique<base::Value>(*request_body_));
|
| + }
|
| + if ((extra_info_spec & ExtraInfoSpec::REQUEST_HEADERS) && request_headers_) {
|
| + result->Set(keys::kRequestHeadersKey,
|
| + base::MakeUnique<base::Value>(*request_headers_));
|
| + }
|
| + if ((extra_info_spec & ExtraInfoSpec::RESPONSE_HEADERS) &&
|
| + response_headers_) {
|
| + result->Set(keys::kResponseHeadersKey,
|
| + base::MakeUnique<base::Value>(*response_headers_));
|
| + }
|
| return result;
|
| }
|
|
|
|
|