Fix object ownership in ui/base/models.

chrome/browser/android/bookmarks/partner_bookmarks_shim.cc

 // 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.
 
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 
 #include <tuple>
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
@@ skipping 157 matching lines @@
       return true;
     parent = parent->parent();
   }
   return false;
 }
 
 const BookmarkNode* PartnerBookmarksShim::GetPartnerBookmarksRoot() const {
   return g_partner_model_keeper.Get().partner_bookmarks_root.get();
 }
 
-void PartnerBookmarksShim::SetPartnerBookmarksRoot(BookmarkNode* root_node) {
+void PartnerBookmarksShim::SetPartnerBookmarksRoot(
+    std::unique_ptr<bookmarks::BookmarkNode> root_node) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  g_partner_model_keeper.Get().partner_bookmarks_root.reset(root_node);
+  g_partner_model_keeper.Get().partner_bookmarks_root = std::move(root_node);
   g_partner_model_keeper.Get().loaded = true;
   FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_,
                     PartnerShimLoaded(this));
 }
 
 PartnerBookmarksShim::NodeRenamingMapKey::NodeRenamingMapKey(
     const GURL& url, const base::string16& provider_title)
     : url_(url), provider_title_(provider_title) {}
 
 PartnerBookmarksShim::NodeRenamingMapKey::~NodeRenamingMapKey() {}
@@ skipping 91 matching lines @@
        i != node_rename_remove_map_.end();
        ++i) {
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString(kMappingUrl, i->first.url().spec());
     dict->SetString(kMappingProviderTitle, i->first.provider_title());
     dict->SetString(kMappingTitle, i->second);
     list.Append(dict);
   }
   prefs_->Set(prefs::kPartnerBookmarkMappings, list);
 }