Remove stl_util's deletion function use from chrome/.

chrome/browser/media_galleries/media_file_system_registry_unittest.cc

 // Copyright (c) 2012 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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <set>
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/media_galleries/media_file_system_context.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
@@ skipping 156 matching lines @@
 }
 
 class MockProfileSharedRenderProcessHostFactory
     : public content::RenderProcessHostFactory {
  public:
   MockProfileSharedRenderProcessHostFactory() {}
   ~MockProfileSharedRenderProcessHostFactory() override;
 
   // RPH created with this factory are owned by it.  If the RPH is destroyed
   // for testing purposes, it must be removed from the factory first.
-  content::MockRenderProcessHost* ReleaseRPH(
+  std::unique_ptr<content::MockRenderProcessHost> ReleaseRPH(
       content::BrowserContext* browser_context);
 
   content::RenderProcessHost* CreateRenderProcessHost(
       content::BrowserContext* browser_context,
       content::SiteInstance* site_instance) const override;
 
  private:
-  typedef std::map<content::BrowserContext*, content::MockRenderProcessHost*>
-      ProfileRPHMap;
-  mutable ProfileRPHMap rph_map_;
+  mutable std::map<content::BrowserContext*,
+                   std::unique_ptr<content::MockRenderProcessHost>>
+      rph_map_;
 
   DISALLOW_COPY_AND_ASSIGN(MockProfileSharedRenderProcessHostFactory);
 };
 
 class ProfileState {
  public:
   explicit ProfileState(
       MockProfileSharedRenderProcessHostFactory* rph_factory);
   ~ProfileState();
 
@@ skipping 168 matching lines @@
   CHECK_NE(a.name, b.name);  // Name must be unique.
   return a.name < b.name;
 }
 
 ///////////////////////////////////////////////
 // MockProfileSharedRenderProcessHostFactory //
 ///////////////////////////////////////////////
 
 MockProfileSharedRenderProcessHostFactory::
     ~MockProfileSharedRenderProcessHostFactory() {
-  base::STLDeleteValues(&rph_map_);
 }
 
-content::MockRenderProcessHost*
+std::unique_ptr<content::MockRenderProcessHost>
 MockProfileSharedRenderProcessHostFactory::ReleaseRPH(
     content::BrowserContext* browser_context) {
-  ProfileRPHMap::iterator existing = rph_map_.find(browser_context);
+  auto existing = rph_map_.find(browser_context);
   if (existing == rph_map_.end())
     return NULL;
-  content::MockRenderProcessHost* result = existing->second;
+  std::unique_ptr<content::MockRenderProcessHost> result =
+      std::move(existing->second);
   rph_map_.erase(existing);
   return result;
 }
 
 content::RenderProcessHost*
 MockProfileSharedRenderProcessHostFactory::CreateRenderProcessHost(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) const {
-  ProfileRPHMap::const_iterator existing = rph_map_.find(browser_context);
+  auto existing = rph_map_.find(browser_context);
   if (existing != rph_map_.end())
-    return existing->second;
+    return existing->second.get();
   rph_map_[browser_context] =
-      new content::MockRenderProcessHost(browser_context);
-  return rph_map_[browser_context];
+      base::MakeUnique<content::MockRenderProcessHost>(browser_context);
+  return rph_map_[browser_context].get();
 }
 
 //////////////////
 // ProfileState //
 //////////////////
 
 ProfileState::ProfileState(
     MockProfileSharedRenderProcessHostFactory* rph_factory)
     : num_comparisons_(0),
       profile_(new TestingProfile()) {
@@ skipping 11 matching lines @@
 
   all_permission_extension_ =
       AddMediaGalleriesApp("all", all_permissions, profile_.get());
   regular_permission_extension_ =
       AddMediaGalleriesApp("regular", read_permissions, profile_.get());
   no_permissions_extension_ =
       AddMediaGalleriesApp("no", read_permissions, profile_.get());
 
   single_web_contents_.reset(
       content::WebContentsTester::CreateTestWebContents(profile_.get(), NULL));
-  single_rph_ = rph_factory->ReleaseRPH(profile_.get());
+  single_rph_ = rph_factory->ReleaseRPH(profile_.get()).release();

[Nico, 2016/10/24 18:41:02]

as far as i can tell nothing ever reads this variable.

How does the rph here get deleted?

[Lei Zhang, 2016/10/24 18:45:14]

The |single_rph_| declaration above has this comment:

// The RenderProcessHosts are freed when their respective WebContents /
// RenderViewHosts go away.

[Nico, 2016/10/24 18:49:00]

But why is this in an env var then? And if something else frees them, why is
this a container of unique_ptrs now? Maybe the comment should be here instead of
in the .h?

[Avi (use Gerrit), 2016/10/24 19:15:37]

Let me remove this set of files from this CL and figure this out better.

 
   shared_web_contents1_.reset(
       content::WebContentsTester::CreateTestWebContents(profile_.get(), NULL));
   shared_web_contents2_.reset(
       content::WebContentsTester::CreateTestWebContents(profile_.get(), NULL));
-  shared_rph_ = rph_factory->ReleaseRPH(profile_.get());
+  shared_rph_ = rph_factory->ReleaseRPH(profile_.get()).release();
 }
 
 ProfileState::~ProfileState() {
   // TestExtensionSystem uses DeleteSoon, so we need to delete the profiles
   // and then run the message queue to clean up.  But first we have to
   // delete everything that references the profile.
   single_web_contents_.reset();
   shared_web_contents1_.reset();
   shared_web_contents2_.reset();
   profile_.reset();
@@ skipping 599 matching lines @@
       fs_info.begin()->second.fsid).empty());
 
   // Revoke permission and ensure that the file system is revoked.
   SetGalleryPermission(profile_state,
                        profile_state->regular_permission_extension(),
                        device_id,
                        false /*has access*/);
   EXPECT_TRUE(test_file_system_context()->GetRegisteredPath(
       fs_info.begin()->second.fsid).empty());
 }