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

Unified Diff: extensions/renderer/script_injection.cc

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 7 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 | « extensions/common/permissions/manifest_permission_set_unittest.cc ('k') | ipc/ipc_message_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/script_injection.cc
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index 5165ed1bbd7acec0150afca005261257b14ac37b..db11923eeb96eb83f3c25c64edbb6d0000ea1fdd 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -317,7 +317,7 @@ void ScriptInjection::OnJsInjectionCompleted(
result.reset(v8_converter->FromV8Value(results[0], context));
}
if (!result.get())
- result.reset(base::Value::CreateNullValue());
+ result = base::Value::CreateNullValue();
// We guarantee that the main frame's result is at the first index, but
// any sub frames results do not have guaranteed order.
execution_results_->Insert(
« no previous file with comments | « extensions/common/permissions/manifest_permission_set_unittest.cc ('k') | ipc/ipc_message_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698