[Extensions] Convert APIs to use movable types [2]

chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc

 // Copyright (c) 2012 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/extensions/api/bookmarks/bookmark_api_helpers.h"
 
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 56 matching lines @@
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   bookmarks::ManagedBookmarkService* managed_;
   BookmarkModel* model_;
   const BookmarkNode* node_;
   const BookmarkNode* node2_;
   const BookmarkNode* folder_;
 };
 
 TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
-  scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(managed_,
-                          model_->other_node(),
-                          true,    // Recurse.
-                          false));  // Not only folders.
-  ASSERT_EQ(3U, tree->children->size());
+  BookmarkTreeNode tree = GetBookmarkTreeNode(managed_, model_->other_node(),
+                                              true,    // Recurse.
+                                              false);  // Not only folders.
+  ASSERT_EQ(3U, tree.children->size());
 }
 
 TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
-  scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(managed_,
-                          model_->other_node(),
-                          true,   // Recurse.
-                          true));  // Only folders.
-  ASSERT_EQ(1U, tree->children->size());
+  BookmarkTreeNode tree = GetBookmarkTreeNode(managed_, model_->other_node(),
+                                              true,   // Recurse.
+                                              true);  // Only folders.
+  ASSERT_EQ(1U, tree.children->size());
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtree) {
-  scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(managed_,
-                          folder_,
-                          true,    // Recurse.
-                          false));  // Not only folders.
-  ASSERT_EQ(4U, tree->children->size());
-  linked_ptr<BookmarkTreeNode> digg = tree->children->at(1);
-  ASSERT_TRUE(digg.get());
-  ASSERT_EQ("Digg", digg->title);
+  BookmarkTreeNode tree = GetBookmarkTreeNode(managed_, folder_,
+                                              true,    // Recurse.
+                                              false);  // Not only folders.
+  ASSERT_EQ(4U, tree.children->size());
+  const BookmarkTreeNode& digg = tree.children->at(1);
+  ASSERT_EQ("Digg", digg.title);
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtreeFoldersOnly) {
-  scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(managed_,
-                          folder_,
-                          true,   // Recurse.
-                          true));  // Only folders.
-  ASSERT_EQ(2U, tree->children->size());
-  linked_ptr<BookmarkTreeNode> inner_folder = tree->children->at(1);
-  ASSERT_TRUE(inner_folder.get());
-  ASSERT_EQ("inner folder 1", inner_folder->title);
+  BookmarkTreeNode tree = GetBookmarkTreeNode(managed_, folder_,
+                                              true,   // Recurse.
+                                              true);  // Only folders.
+  ASSERT_EQ(2U, tree.children->size());
+  const BookmarkTreeNode& inner_folder = tree.children->at(1);
+  ASSERT_EQ("inner folder 1", inner_folder.title);
 }
 
 TEST_F(ExtensionBookmarksTest, GetModifiableNode) {
-  scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(managed_,
-                          node_,
-                          false,    // Recurse.
-                          false));  // Only folders.
-  EXPECT_EQ("Digg", tree->title);
-  ASSERT_TRUE(tree->url);
-  EXPECT_EQ("http://www.reddit.com/", *tree->url);
+  BookmarkTreeNode tree = GetBookmarkTreeNode(managed_, node_,
+                                              false,   // Recurse.
+                                              false);  // Only folders.
+  EXPECT_EQ("Digg", tree.title);
+  ASSERT_TRUE(tree.url);
+  EXPECT_EQ("http://www.reddit.com/", *tree.url);
   EXPECT_EQ(api::bookmarks::BOOKMARK_TREE_NODE_UNMODIFIABLE_NONE,
-            tree->unmodifiable);
+            tree.unmodifiable);
 }
 
 TEST_F(ExtensionBookmarksTest, GetManagedNode) {
   const BookmarkNode* managed_bookmark =
       model_->AddURL(managed_->managed_node(),
                      0,
                      base::ASCIIToUTF16("Chromium"),
                      GURL("http://www.chromium.org/"));
-  scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(managed_,
-                          managed_bookmark,
-                          false,    // Recurse.
-                          false));  // Only folders.
-  EXPECT_EQ("Chromium", tree->title);
-  EXPECT_EQ("http://www.chromium.org/", *tree->url);
+  BookmarkTreeNode tree = GetBookmarkTreeNode(managed_, managed_bookmark,
+                                              false,   // Recurse.
+                                              false);  // Only folders.
+  EXPECT_EQ("Chromium", tree.title);
+  EXPECT_EQ("http://www.chromium.org/", *tree.url);
   EXPECT_EQ(api::bookmarks::BOOKMARK_TREE_NODE_UNMODIFIABLE_MANAGED,
-            tree->unmodifiable);
+            tree.unmodifiable);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeInvalidId) {
   int64_t invalid_id = model_->next_node_id();
   std::string error;
   EXPECT_FALSE(RemoveNode(model_, managed_, invalid_id, true, &error));
   EXPECT_EQ(keys::kNoNodeError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodePermanent) {
@@ skipping 82 matching lines @@
   string_value.clear();
   EXPECT_FALSE(dictionary_value->GetString("some_key1", &string_value));
   EXPECT_EQ("", string_value);
   EXPECT_TRUE(dictionary_value->GetString("some_key2", &string_value));
   EXPECT_EQ("some_value2", string_value);
 
 }
 
 }  // namespace bookmark_api_helpers
 }  // namespace extensions