Chromium Code Reviews| Index: chrome/browser/devtools/devtools_ui_bindings.cc |
| diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc |
| index 004a24eee90cd4345ff4784e988e4e62894ca94c..c1afeec82d75150ac43336279227fcd12d2e88a9 100644 |
| --- a/chrome/browser/devtools/devtools_ui_bindings.cc |
| +++ b/chrome/browser/devtools/devtools_ui_bindings.cc |
| @@ -1099,10 +1099,9 @@ void DevToolsUIBindings::OnURLFetchComplete(const net::URLFetcher* source) { |
| DCHECK(it != pending_requests_.end()); |
| base::DictionaryValue response; |
| - base::DictionaryValue* headers = new base::DictionaryValue(); |
| + auto headers = base::MakeUnique<base::DictionaryValue>(); |
| net::HttpResponseHeaders* rh = source->GetResponseHeaders(); |
| response.SetInteger("statusCode", rh ? rh->response_code() : 200); |
| - response.Set("headers", headers); |
| size_t iterator = 0; |
| std::string name; |
| @@ -1110,6 +1109,7 @@ void DevToolsUIBindings::OnURLFetchComplete(const net::URLFetcher* source) { |
| while (rh && rh->EnumerateHeaderLines(&iterator, &name, &value)) |
| headers->SetString(name, value); |
| + response.Set("headers", std::move(headers)); |
| it->second.Run(&response); |
| pending_requests_.erase(it); |
| delete source; |
| @@ -1273,14 +1273,15 @@ void DevToolsUIBindings::AddDevToolsExtensionsToClient() { |
| new base::DictionaryValue()); |
| extension_info->Set( |
|
dgozman
2017/04/06 15:43:47
nit: let's use SetString here to avoid MakeUnique
vabr (Chromium)
2017/04/07 20:40:39
Done.
|
| "startPage", |
| - new base::Value( |
| + base::MakeUnique<base::Value>( |
| extensions::chrome_manifest_urls::GetDevToolsPage(extension.get()) |
| .spec())); |
| - extension_info->Set("name", new base::Value(extension->name())); |
| - extension_info->Set( |
| - "exposeExperimentalAPIs", |
| - new base::Value(extension->permissions_data()->HasAPIPermission( |
| - extensions::APIPermission::kExperimental))); |
| + extension_info->Set("name", |
|
dgozman
2017/04/06 15:43:47
ditto
vabr (Chromium)
2017/04/07 20:40:39
Done.
|
| + base::MakeUnique<base::Value>(extension->name())); |
| + extension_info->Set("exposeExperimentalAPIs", |
|
dgozman
2017/04/06 15:43:47
And SetBoolean here.
vabr (Chromium)
2017/04/07 20:40:39
Done.
|
| + base::MakeUnique<base::Value>( |
| + extension->permissions_data()->HasAPIPermission( |
| + extensions::APIPermission::kExperimental))); |
| results.Append(std::move(extension_info)); |
| } |