Part 2 of base::IDMap refactor to eliminate IDMapOwnPointer/IDMapExternalPointer modes

chrome/browser/android/compositor/layer_title_cache.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/android/compositor/layer_title_cache.h"
 
 #include <android/bitmap.h>
 
 #include <memory>
 
@@ skipping 72 matching lines @@
                                     jint favicon_resource_id) {
   DecorationTitle* title_layer = layer_cache_.Lookup(tab_id);
   if (title_layer == nullptr && favicon_resource_id != -1) {
     title_layer->SetFaviconResourceId(favicon_resource_id);
   }
 }
 
 void LayerTitleCache::ClearExcept(JNIEnv* env,
                                   const JavaParamRef<jobject>& obj,
                                   jint except_id) {
-  IDMap<DecorationTitle, IDMapOwnPointer>::iterator iter(&layer_cache_);
+  IDMap<std::unique_ptr<DecorationTitle>>::iterator iter(&layer_cache_);
   for (; !iter.IsAtEnd(); iter.Advance()) {
     const int id = iter.GetCurrentKey();
     if (id != except_id)
       layer_cache_.Remove(id);
   }
 }
 
 DecorationTitle* LayerTitleCache::GetTitleLayer(int tab_id) {
   if (!layer_cache_.Lookup(tab_id)) {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_LayerTitleCache_buildUpdatedTitle(env, weak_java_title_cache_.get(env),
         tab_id);
   }
 
   return layer_cache_.Lookup(tab_id);
 }
 
 void LayerTitleCache::SetResourceManager(
     ui::ResourceManager* resource_manager) {
   resource_manager_ = resource_manager;
 
-  IDMap<DecorationTitle, IDMapOwnPointer>::iterator iter(&layer_cache_);
+  IDMap<std::unique_ptr<DecorationTitle>>::iterator iter(&layer_cache_);
   for (; !iter.IsAtEnd(); iter.Advance()) {
     iter.GetCurrentValue()->SetResourceManager(resource_manager_);
   }
 }
 
 LayerTitleCache::~LayerTitleCache() {
 }
 
 bool RegisterLayerTitleCache(JNIEnv* env) {
   return RegisterNativesImpl(env);
@@ skipping 10 matching lines @@
            jint favicon_end_padding,
            jint spinner_resource_id,
            jint spinner_incognito_resource_id) {
   LayerTitleCache* cache = new LayerTitleCache(
       env, obj, fade_width, favicon_start_padding, favicon_end_padding,
       spinner_resource_id, spinner_incognito_resource_id);
   return reinterpret_cast<intptr_t>(cache);
 }
 
 }  // namespace android