Convert implicit scoped_refptr constructor calls to explicit ones, part 2

This CL was created automatically by this clang rewriter: http://codereview.appspot.com/2826041
I then did quite a bit of manual editing to fix style issues.

BUG=28083
TEST=None

Review URL: http://codereview.chromium.org/4291001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64798 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 23 insertions, 13 deletions

diff --git a/webkit/appcache/appcache_storage_impl.cc b/webkit/appcache/appcache_storage_impl.cc
index 232dffb..c8f6e3a 100644
--- a/webkit/appcache/appcache_storage_impl.cc
+++ b/webkit/appcache/appcache_storage_impl.cc
@@ -48,7 +48,7 @@ class AppCacheStorageImpl::DatabaseTask
   virtual ~DatabaseTask() {}
 
   void AddDelegate(DelegateReference* delegate_reference) {
-    delegates_.push_back(delegate_reference);
+    delegates_.push_back(make_scoped_refptr(delegate_reference));
   }
 
   // Schedules a task to be Run() on the DB thread. Tasks
diff --git a/webkit/appcache/mock_appcache_storage.cc b/webkit/appcache/mock_appcache_storage.cc
index a50dca6..13ae899 100644
--- a/webkit/appcache/mock_appcache_storage.cc
+++ b/webkit/appcache/mock_appcache_storage.cc
@@ -390,8 +390,10 @@ void MockAppCacheStorage::RunOnePendingTask() {
 
 void MockAppCacheStorage::AddStoredCache(AppCache* cache) {
   int64 cache_id = cache->cache_id();
-  if (stored_caches_.find(cache_id) == stored_caches_.end())
-    stored_caches_.insert(StoredCacheMap::value_type(cache_id, cache));
+  if (stored_caches_.find(cache_id) == stored_caches_.end()) {
+    stored_caches_.insert(
+        StoredCacheMap::value_type(cache_id, make_scoped_refptr(cache)));
+  }
 }
 
 void MockAppCacheStorage::RemoveStoredCache(AppCache* cache) {
@@ -411,8 +413,10 @@ void MockAppCacheStorage::RemoveStoredCaches(
 
 void MockAppCacheStorage::AddStoredGroup(AppCacheGroup* group) {
   const GURL& url = group->manifest_url();
-  if (stored_groups_.find(url) == stored_groups_.end())
-    stored_groups_.insert(StoredGroupMap::value_type(url, group));
+  if (stored_groups_.find(url) == stored_groups_.end()) {
+    stored_groups_.insert(
+        StoredGroupMap::value_type(url, make_scoped_refptr(group)));
+  }
 }
 
 void MockAppCacheStorage::RemoveStoredGroup(AppCacheGroup* group) {
diff --git a/webkit/glue/plugins/pepper_file_chooser.cc b/webkit/glue/plugins/pepper_file_chooser.cc
index 098d60d..576e205 100644
--- a/webkit/glue/plugins/pepper_file_chooser.cc
+++ b/webkit/glue/plugins/pepper_file_chooser.cc
@@ -118,8 +118,10 @@ void FileChooser::StoreChosenFiles(const std::vector<std::string>& files) {
   next_chosen_file_index_ = 0;
   std::vector<std::string>::const_iterator end_it = files.end();
   for (std::vector<std::string>::const_iterator it = files.begin();
-       it != end_it; it++)
-    chosen_files_.push_back(new FileRef(module(), FilePath().AppendASCII(*it)));
+       it != end_it; it++) {
+    chosen_files_.push_back(make_scoped_refptr(
+        new FileRef(module(), FilePath().AppendASCII(*it))));
+  }
 
   if (!completion_callback_.func)
     return;
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
index f7b3bf7..df949d0 100644
--- a/webkit/glue/plugins/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -91,7 +91,7 @@ PluginStreamUrl* PluginInstance::CreateStream(unsigned long resource_id,
 }
 
 void PluginInstance::AddStream(PluginStream* stream) {
-  open_streams_.push_back(stream);
+  open_streams_.push_back(make_scoped_refptr(stream));
 }
 
 void PluginInstance::RemoveStream(PluginStream* stream) {
diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc
index 6c95274..ee613c1 100644
--- a/webkit/glue/plugins/plugin_lib.cc
+++ b/webkit/glue/plugins/plugin_lib.cc
@@ -74,7 +74,7 @@ PluginLib::PluginLib(const WebPluginInfo& info,
       skip_unload_(false) {
   base::StatsCounter(kPluginLibrariesLoadedCounter).Increment();
   memset(static_cast<void*>(&plugin_funcs_), 0, sizeof(plugin_funcs_));
-  g_loaded_libs->push_back(this);
+  g_loaded_libs->push_back(make_scoped_refptr(this));
 
   if (entry_points) {
     internal_ = true;
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc
index 019a664..21a083d 100644
--- a/webkit/glue/webmediaplayer_impl.cc
+++ b/webkit/glue/webmediaplayer_impl.cc
@@ -284,10 +284,14 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
   }
 
   // Add in the default filter factories.
-  filter_collection_.push_back(new media::FFmpegDemuxer());
-  filter_collection_.push_back(new media::FFmpegAudioDecoder());
-  filter_collection_.push_back(new media::FFmpegVideoDecoder(NULL));
-  filter_collection_.push_back(new media::NullAudioRenderer());
+  filter_collection_.push_back(make_scoped_refptr(
+      new media::FFmpegDemuxer()));
+  filter_collection_.push_back(make_scoped_refptr(
+      new media::FFmpegAudioDecoder()));
+  filter_collection_.push_back(make_scoped_refptr(
+      new media::FFmpegVideoDecoder(NULL)));
+  filter_collection_.push_back(make_scoped_refptr(
+      new media::NullAudioRenderer()));
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {