base: Remove OwningMRUCache in favor of scoped_ptrs in MRUCache

chrome/browser/ui/app_list/search/common/webservice_cache.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_WEBSERVICE_CACHE_H_
 #define CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_WEBSERVICE_CACHE_H_
 
 #include <utility>
 
 #include "base/containers/mru_cache.h"
@@ skipping 46 matching lines @@
   // mixing of the queries.
   const CacheResult Get(QueryType type, const std::string& query);
 
   // Puts the new result to the query.
   void Put(QueryType type,
            const std::string& query,
            scoped_ptr<base::DictionaryValue> result);
 
  private:
   struct Payload {
-    Payload(const base::Time& time,
-            const base::DictionaryValue* result)
-        : time(time), result(result) {}
-    Payload() {}
+    Payload(const base::Time& time, scoped_ptr<base::DictionaryValue> result);
+    Payload();
+    ~Payload();
+
+    Payload& operator=(Payload&& other);
 
     base::Time time;
-    const base::DictionaryValue* result;
+    scoped_ptr<base::DictionaryValue> result;
   };
 
-  class CacheDeletor {
-   public:
-    void operator()(const Payload& payload);
-  };
-  typedef base::
-      MRUCacheBase<std::string, Payload, std::less<std::string>, CacheDeletor>
-          Cache;
+  using Cache = base::MRUCache<std::string, scoped_ptr<Payload>>;
 
   // Callback for when the cache is loaded from the dictionary data store.
   void OnCacheLoaded(scoped_ptr<base::DictionaryValue>);
 
   // Populates the payload parameter with the corresponding payload stored
   // in the given dictionary. If the dictionary is invalid for any reason,
   // this method will return false.
-  bool PayloadFromDict(const base::DictionaryValue* dict,
-                       Payload* payload);
+  bool PayloadFromDict(const base::DictionaryValue* dict, Payload* payload);
 
   // Returns a dictionary value for a given payload. The returned dictionary
   // will be owned by the data_store_ cached_dict, and freed on the destruction
   // of our dictionary datastore.
   base::DictionaryValue* DictFromPayload(const Payload& payload);
 
   // Trims our MRU cache, making sure that any element that is removed is also
   // removed from the dictionary data store.
   void TrimCache();
 
   // Prepends a type string to the given query and returns a new query string.
   std::string PrependType(QueryType type, const std::string& query);
 
   Cache cache_;
   scoped_refptr<DictionaryDataStore> data_store_;
 
   bool cache_loaded_;
 
   DISALLOW_COPY_AND_ASSIGN(WebserviceCache);
 };
 
 }  // namespace app_list
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_SEARCH_COMMON_WEBSERVICE_CACHE_H_