Fix object ownership in ui/base/models.

chrome/browser/android/bookmarks/partner_bookmarks_reader.cc

 // Copyright 2015 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_reader.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/PartnerBookmarksReader_jni.h"
@@ skipping 94 matching lines @@
       wip_next_available_id_(0) {
 }
 
 PartnerBookmarksReader::~PartnerBookmarksReader() {}
 
 void PartnerBookmarksReader::PartnerBookmarksCreationComplete(
     JNIEnv*,
     const JavaParamRef<jobject>&) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   partner_bookmarks_shim_->SetPartnerBookmarksRoot(
-      wip_partner_bookmarks_root_.release());
+      std::move(wip_partner_bookmarks_root_));
   wip_next_available_id_ = 0;
 }
 
 void PartnerBookmarksReader::Destroy(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void PartnerBookmarksReader::Reset(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj) {
@@ skipping 11 matching lines @@
     jlong parent_id,
     const JavaParamRef<jbyteArray>& favicon,
     const JavaParamRef<jbyteArray>& touchicon) {
   base::string16 url;
   base::string16 title;
   if (jurl)
     url = ConvertJavaStringToUTF16(env, jurl);
   if (jtitle)
     title = ConvertJavaStringToUTF16(env, jtitle);
 
-  BookmarkNode* node = NULL;
+  jlong node_id = 0;
   if (wip_partner_bookmarks_root_.get()) {
-    node = new BookmarkNode(wip_next_available_id_++, GURL(url));
+    std::unique_ptr<BookmarkNode> node =
+        base::MakeUnique<BookmarkNode>(wip_next_available_id_++, GURL(url));
     node->set_type(is_folder ? BookmarkNode::FOLDER : BookmarkNode::URL);
     node->SetTitle(title);
 
     // Handle favicon and touchicon
-    if (profile_ != NULL && (favicon != NULL || touchicon != NULL)) {
-      jbyteArray icon = (touchicon != NULL) ? touchicon : favicon;
+    if (profile_ != nullptr && (favicon != nullptr || touchicon != nullptr)) {
+      jbyteArray icon = (touchicon != nullptr) ? touchicon : favicon;
       const favicon_base::IconType icon_type =
           touchicon ? favicon_base::TOUCH_ICON : favicon_base::FAVICON;
       const int icon_len = env->GetArrayLength(icon);
-      jbyte* icon_bytes = env->GetByteArrayElements(icon, NULL);
+      jbyte* icon_bytes = env->GetByteArrayElements(icon, nullptr);
       if (icon_bytes)
-        PrepareAndSetFavicon(env, icon_bytes, icon_len,
-                             node, profile_, icon_type);
+        PrepareAndSetFavicon(env, icon_bytes, icon_len, node.get(), profile_,
+                             icon_type);
       env->ReleaseByteArrayElements(icon, icon_bytes, JNI_ABORT);
     }
 
     const BookmarkNode* parent =
         GetNodeByID(wip_partner_bookmarks_root_.get(), parent_id);
     if (!parent) {
       LOG(WARNING) << "partner_bookmarks_shim: invalid/unknown parent_id="
                    << parent_id << ": adding to the root";
       parent = wip_partner_bookmarks_root_.get();
     }
-    const_cast<BookmarkNode*>(parent)->Add(node, parent->child_count());
+    node_id = node->id();
+    const_cast<BookmarkNode*>(parent)->Add(std::move(node),
+                                           parent->child_count());
   } else {
-    node = new BookmarkPermanentNode(wip_next_available_id_++);
+    std::unique_ptr<BookmarkPermanentNode> node =
+        base::MakeUnique<BookmarkPermanentNode>(wip_next_available_id_++);
+    node_id = node->id();
     node->SetTitle(title);
-    wip_partner_bookmarks_root_.reset(node);
+    wip_partner_bookmarks_root_ = std::move(node);
   }
-  return node->id();
+  return node_id;
 }
 
 // static
 static void DisablePartnerBookmarksEditing(JNIEnv* env,
                                            const JavaParamRef<jclass>& clazz) {
   PartnerBookmarksShim::DisablePartnerBookmarksEditing();
 }
 
 // static
 bool PartnerBookmarksReader::RegisterPartnerBookmarksReader(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // ----------------------------------------------------------------
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   PartnerBookmarksShim* partner_bookmarks_shim =
       PartnerBookmarksShim::BuildForBrowserContext(profile);
   PartnerBookmarksReader* reader = new PartnerBookmarksReader(
       partner_bookmarks_shim, profile);
   return reinterpret_cast<intptr_t>(reader);
 }