Add scoped_ptr-safe base::Value to Dictionary/List conversion functions.

extensions/renderer/event_bindings.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/event_bindings.h"
 
 #include <map>
 #include <utility>
 
 #include "base/basictypes.h"
@@ skipping 247 matching lines @@
   scoped_ptr<base::DictionaryValue> filter;
   {
     scoped_ptr<content::V8ValueConverter> converter(
         content::V8ValueConverter::create());
     scoped_ptr<base::Value> filter_value(converter->FromV8Value(
         v8::Local<v8::Object>::Cast(args[1]), context()->v8_context()));
     if (!filter_value || !filter_value->IsType(base::Value::TYPE_DICTIONARY)) {
       args.GetReturnValue().Set(static_cast<int32_t>(-1));
       return;
     }
-    filter.reset(static_cast<base::DictionaryValue*>(filter_value.release()));
+    filter = base::DictionaryValue::From(filter_value.Pass());
   }
 
   // Hold onto a weak reference to |filter| so that it can be used after passing
   // ownership to |event_filter|.
   base::DictionaryValue* filter_weak = filter.get();
   int id = g_event_filter.Get().AddEventMatcher(
       event_name, ParseEventMatcher(filter.Pass()));
   attached_matcher_ids_.insert(id);
 
   // Only send IPCs the first time a filter gets added.
@@ skipping 77 matching lines @@
   // Same for filtered events.
   std::set<int> attached_matcher_ids_safe = attached_matcher_ids_;
   for (int matcher_id : attached_matcher_ids_safe) {
     DetachFilteredEvent(matcher_id, false /* is_manual */);
   }
   DCHECK(attached_matcher_ids_.empty())
       << "Filtered events cannot be attached during invalidation";
 }
 
 }  // namespace extensions