More base::Values-related bare pointer -> scoped_ptr conversions

extensions/renderer/script_injection.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/renderer/script_injection.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram.h"
@@ skipping 299 matching lines @@
       scoped_ptr<content::V8ValueConverter> v8_converter(
           content::V8ValueConverter::create());
       // It's safe to always use the main world context when converting
       // here. V8ValueConverterImpl shouldn't actually care about the
       // context scope, and it switches to v8::Object's creation context
       // when encountered.
       v8::Local<v8::Context> context = frame->mainWorldScriptContext();
       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(
         frame == web_frame_ ? 0 : execution_results_->GetSize(),
         result.release());
   }
   TryToFinish();
 }
 
 void ScriptInjection::TryToFinish() {
@@ skipping 12 matching lines @@
   std::vector<std::string> css_sources =
       injector_->GetCssSources(run_location_);
   for (std::vector<std::string>::const_iterator iter = css_sources.begin();
        iter != css_sources.end();
        ++iter) {
     frame->document().insertStyleSheet(blink::WebString::fromUTF8(*iter));
   }
 }
 
 }  // namespace extensions