base: Remove OwningMRUCache in favor of scoped_ptrs in MRUCache

chrome/browser/bitmap_fetcher/bitmap_fetcher_service.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 "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 78 matching lines @@
     ++current_request_id_;
   int request_id = current_request_id_;
   scoped_ptr<BitmapFetcherRequest> request(
       new BitmapFetcherRequest(request_id, observer));
 
   // Reject invalid URLs.
   if (!url.is_valid())
     return REQUEST_ID_INVALID;
 
   // Check for existing images first.
-  base::OwningMRUCache<GURL, CacheEntry*>::iterator iter = cache_.Get(url);
+  auto iter = cache_.Get(url);
   if (iter != cache_.end()) {
-    BitmapFetcherService::CacheEntry* entry = iter->second;
+    BitmapFetcherService::CacheEntry* entry = iter->second.get();
     request->NotifyImageChanged(entry->bitmap.get());
 
     // There is no request ID associated with this - data is already delivered.
     return REQUEST_ID_INVALID;
   }
 
   // Limit number of simultaneous in-flight requests.
   if (requests_.size() > kMaxRequests)
     return REQUEST_ID_INVALID;
 
@@ skipping 65 matching lines @@
   while (iter != requests_.end()) {
     if ((*iter)->get_fetcher() == fetcher) {
       (*iter)->NotifyImageChanged(bitmap);
       iter = requests_.erase(iter);
     } else {
       ++iter;
     }
   }
 
   if (bitmap && !bitmap->isNull()) {
-    CacheEntry* entry = new CacheEntry;
+    scoped_ptr<CacheEntry> entry(new CacheEntry);

[gone, 2016/03/07 22:01:32]

nit: make_scoped_ptr?

[danakj, 2016/03/07 22:02:42]

lol. I asked the opposite in the previous patch set, as it makes the line way
longer.

[gone, 2016/03/07 22:03:33]

lol!  I'm fine either way.

     entry->bitmap.reset(new SkBitmap(*bitmap));
-    cache_.Put(fetcher->url(), entry);
+    cache_.Put(fetcher->url(), std::move(entry));
   }
 
   RemoveFetcher(fetcher);
 }