base: Remove OwningMRUCache in favor of scoped_ptrs in MRUCache

base/containers/mru_cache_unittest.cc

 // Copyright (c) 2011 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 <stddef.h>
 
 #include "base/containers/mru_cache.h"
+#include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 int cached_item_live_count = 0;
 
 struct CachedItem {
   CachedItem() : value(0) {
     cached_item_live_count++;
   }
@@ skipping 162 matching lines @@
   // Make it so only the most important element is there.
   cache.ShrinkToSize(1);
 
   Cache::iterator iter = cache.begin();
   EXPECT_EQ(kItem3Key, iter->first);
   EXPECT_EQ(item5.value, iter->second.value);
 }
 
 // Make sure that the owning version release its pointers properly.
 TEST(MRUCacheTest, Owning) {
-  typedef base::OwningMRUCache<int, CachedItem*> Cache;
+  typedef base::MRUCache<int, scoped_ptr<CachedItem>> Cache;

[danakj, 2016/03/07 21:27:10]

dittos

[vmpstr, 2016/03/07 21:45:32]

Done.

   Cache cache(Cache::NO_AUTO_EVICT);
 
   int initial_count = cached_item_live_count;
 
   // First insert and item and then overwrite it.
   static const int kItem1Key = 1;
-  cache.Put(kItem1Key, new CachedItem(20));
-  cache.Put(kItem1Key, new CachedItem(22));
+  cache.Put(kItem1Key, make_scoped_ptr(new CachedItem(20)));
+  cache.Put(kItem1Key, make_scoped_ptr(new CachedItem(22)));
 
   // There should still be one item, and one extra live item.
   Cache::iterator iter = cache.Get(kItem1Key);
   EXPECT_EQ(1U, cache.size());
   EXPECT_TRUE(iter != cache.end());
   EXPECT_EQ(initial_count + 1, cached_item_live_count);
 
   // Now remove it.
   cache.Erase(cache.begin());
   EXPECT_EQ(initial_count, cached_item_live_count);
 
   // Now try another cache that goes out of scope to make sure its pointers
   // go away.
   {
     Cache cache2(Cache::NO_AUTO_EVICT);
-    cache2.Put(1, new CachedItem(20));
-    cache2.Put(2, new CachedItem(20));
+    cache2.Put(1, make_scoped_ptr(new CachedItem(20)));
+    cache2.Put(2, make_scoped_ptr(new CachedItem(20)));
   }
 
   // There should be no objects leaked.
   EXPECT_EQ(initial_count, cached_item_live_count);
 
   // Check that Clear() also frees things correctly.
   {
     Cache cache2(Cache::NO_AUTO_EVICT);
-    cache2.Put(1, new CachedItem(20));
-    cache2.Put(2, new CachedItem(20));
+    cache2.Put(1, make_scoped_ptr(new CachedItem(20)));
+    cache2.Put(2, make_scoped_ptr(new CachedItem(20)));
     EXPECT_EQ(initial_count + 2, cached_item_live_count);
     cache2.Clear();
     EXPECT_EQ(initial_count, cached_item_live_count);
   }
 }
 
 TEST(MRUCacheTest, AutoEvict) {
-  typedef base::OwningMRUCache<int, CachedItem*> Cache;
+  typedef base::MRUCache<int, scoped_ptr<CachedItem>> Cache;

[danakj, 2016/03/07 21:27:10]

dittoss

[vmpstr, 2016/03/07 21:45:32]

Done.

   static const Cache::size_type kMaxSize = 3;
 
   int initial_count = cached_item_live_count;
 
   {
     Cache cache(kMaxSize);
 
     static const int kItem1Key = 1, kItem2Key = 2, kItem3Key = 3, kItem4Key = 4;
-    cache.Put(kItem1Key, new CachedItem(20));
-    cache.Put(kItem2Key, new CachedItem(21));
-    cache.Put(kItem3Key, new CachedItem(22));
-    cache.Put(kItem4Key, new CachedItem(23));
+    cache.Put(kItem1Key, make_scoped_ptr(new CachedItem(20)));
+    cache.Put(kItem2Key, make_scoped_ptr(new CachedItem(21)));
+    cache.Put(kItem3Key, make_scoped_ptr(new CachedItem(22)));
+    cache.Put(kItem4Key, make_scoped_ptr(new CachedItem(23)));
 
     // The cache should only have kMaxSize items in it even though we inserted
     // more.
     EXPECT_EQ(kMaxSize, cache.size());
   }
 
   // There should be no objects leaked.
   EXPECT_EQ(initial_count, cached_item_live_count);
 }
 
@@ skipping 111 matching lines @@
     ASSERT_TRUE(iter != cache2.end());
     EXPECT_EQ(kItem2Key, iter->first);
     EXPECT_EQ(item2.value, iter->second.value);
 
     ++iter;
     ASSERT_TRUE(iter != cache2.end());
     EXPECT_EQ(kItem1Key, iter->first);
     EXPECT_EQ(item1.value, iter->second.value);
   }
 }