bookmarks: BookmarkNodeData's size() cleanups.

components/bookmarks/browser/bookmark_node_data_unittest.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 "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 75 matching lines @@
 TEST_F(BookmarkNodeDataTest, JustURL) {
   const GURL url("http://google.com");
   const base::string16 title(ASCIIToUTF16("google.com"));
 
   ui::OSExchangeData data;
   data.SetURL(url, title);
 
   BookmarkNodeData drag_data;
   EXPECT_TRUE(drag_data.Read(ui::OSExchangeData(CloneProvider(data))));
   EXPECT_TRUE(drag_data.is_valid());
-  ASSERT_EQ(1u, drag_data.elements.size());
+  ASSERT_EQ(1u, drag_data.size());
   EXPECT_TRUE(drag_data.elements[0].is_url);
   EXPECT_EQ(url, drag_data.elements[0].url);
   EXPECT_EQ(title, drag_data.elements[0].title);
   EXPECT_TRUE(drag_data.elements[0].date_added.is_null());
   EXPECT_TRUE(drag_data.elements[0].date_folder_modified.is_null());
   EXPECT_EQ(0u, drag_data.elements[0].children.size());
 }
 
 TEST_F(BookmarkNodeDataTest, URL) {
   // Write a single node representing a URL to the clipboard.
   const BookmarkNode* root = model()->bookmark_bar_node();
   GURL url(GURL("http://foo.com"));
   const base::string16 title(ASCIIToUTF16("foo.com"));
   const BookmarkNode* node = model()->AddURL(root, 0, title, url);
   BookmarkNodeData drag_data(node);
   EXPECT_TRUE(drag_data.is_valid());
-  ASSERT_EQ(1u, drag_data.elements.size());
+  ASSERT_EQ(1u, drag_data.size());
   EXPECT_TRUE(drag_data.elements[0].is_url);
   EXPECT_EQ(url, drag_data.elements[0].url);
   EXPECT_EQ(title, drag_data.elements[0].title);
   EXPECT_EQ(node->date_added(), drag_data.elements[0].date_added);
   EXPECT_EQ(node->date_folder_modified(),
             drag_data.elements[0].date_folder_modified);
   ui::OSExchangeData data;
   drag_data.Write(GetProfilePath(), &data);
 
   // Now read the data back in.
   ui::OSExchangeData data2(CloneProvider(data));
   BookmarkNodeData read_data;
   EXPECT_TRUE(read_data.Read(data2));
   EXPECT_TRUE(read_data.is_valid());
-  ASSERT_EQ(1u, read_data.elements.size());
+  ASSERT_EQ(1u, read_data.size());
   EXPECT_TRUE(read_data.elements[0].is_url);
   EXPECT_EQ(url, read_data.elements[0].url);
   EXPECT_EQ(title, read_data.elements[0].title);
   EXPECT_TRUE(read_data.elements[0].date_added.is_null());
   EXPECT_TRUE(read_data.elements[0].date_folder_modified.is_null());
   EXPECT_TRUE(read_data.GetFirstNode(model(), GetProfilePath()) == node);
 
   // Make sure asking for the node with a different profile returns NULL.
   base::ScopedTempDir other_profile_dir;
   EXPECT_TRUE(other_profile_dir.CreateUniqueTempDir());
@@ skipping 11 matching lines @@
 
 // Tests writing a folder to the clipboard.
 TEST_F(BookmarkNodeDataTest, Folder) {
   const BookmarkNode* root = model()->bookmark_bar_node();
   const BookmarkNode* g1 = model()->AddFolder(root, 0, ASCIIToUTF16("g1"));
   model()->AddFolder(g1, 0, ASCIIToUTF16("g11"));
   const BookmarkNode* g12 = model()->AddFolder(g1, 0, ASCIIToUTF16("g12"));
 
   BookmarkNodeData drag_data(g12);
   EXPECT_TRUE(drag_data.is_valid());
-  ASSERT_EQ(1u, drag_data.elements.size());
+  ASSERT_EQ(1u, drag_data.size());
   EXPECT_EQ(g12->GetTitle(), drag_data.elements[0].title);
   EXPECT_FALSE(drag_data.elements[0].is_url);
   EXPECT_EQ(g12->date_added(), drag_data.elements[0].date_added);
   EXPECT_EQ(g12->date_folder_modified(),
             drag_data.elements[0].date_folder_modified);
 
   ui::OSExchangeData data;
   drag_data.Write(GetProfilePath(), &data);
 
   // Now read the data back in.
   ui::OSExchangeData data2(CloneProvider(data));
   BookmarkNodeData read_data;
   EXPECT_TRUE(read_data.Read(data2));
   EXPECT_TRUE(read_data.is_valid());
-  ASSERT_EQ(1u, read_data.elements.size());
+  ASSERT_EQ(1u, read_data.size());
   EXPECT_EQ(g12->GetTitle(), read_data.elements[0].title);
   EXPECT_FALSE(read_data.elements[0].is_url);
   EXPECT_TRUE(read_data.elements[0].date_added.is_null());
   EXPECT_TRUE(read_data.elements[0].date_folder_modified.is_null());
 
   // We should get back the same node when asking for the same profile.
   const BookmarkNode* r_g12 = read_data.GetFirstNode(model(), GetProfilePath());
   EXPECT_TRUE(g12 == r_g12);
 
   // A different profile should return NULL for the node.
@@ skipping 15 matching lines @@
 
   BookmarkNodeData drag_data(folder);
 
   ui::OSExchangeData data;
   drag_data.Write(GetProfilePath(), &data);
 
   // Now read the data back in.
   ui::OSExchangeData data2(CloneProvider(data));
   BookmarkNodeData read_data;
   EXPECT_TRUE(read_data.Read(data2));
-  ASSERT_EQ(1u, read_data.elements.size());
+  ASSERT_EQ(1u, read_data.size());
   ASSERT_EQ(1u, read_data.elements[0].children.size());
   const BookmarkNodeData::Element& read_child =
       read_data.elements[0].children[0];
 
   EXPECT_TRUE(read_child.is_url);
   EXPECT_EQ(title, read_child.title);
   EXPECT_EQ(url, read_child.url);
   EXPECT_TRUE(read_data.elements[0].date_added.is_null());
   EXPECT_TRUE(read_data.elements[0].date_folder_modified.is_null());
   EXPECT_TRUE(read_child.is_url);
@@ skipping 20 matching lines @@
   nodes.push_back(url_node);
   BookmarkNodeData drag_data(nodes);
   ui::OSExchangeData data;
   drag_data.Write(GetProfilePath(), &data);
 
   // Read the data back in.
   ui::OSExchangeData data2(CloneProvider(data));
   BookmarkNodeData read_data;
   EXPECT_TRUE(read_data.Read(data2));
   EXPECT_TRUE(read_data.is_valid());
-  ASSERT_EQ(2u, read_data.elements.size());
+  ASSERT_EQ(2u, read_data.size());
   ASSERT_EQ(1u, read_data.elements[0].children.size());
   EXPECT_TRUE(read_data.elements[0].date_added.is_null());
   EXPECT_TRUE(read_data.elements[0].date_folder_modified.is_null());
 
   const BookmarkNodeData::Element& read_folder = read_data.elements[0];
   EXPECT_FALSE(read_folder.is_url);
   EXPECT_EQ(ASCIIToUTF16("g1"), read_folder.title);
   EXPECT_EQ(1u, read_folder.children.size());
 
   const BookmarkNodeData::Element& read_url = read_data.elements[1];
@@ skipping 124 matching lines @@
 
   BookmarkNodeData node_data(node);
   ui::OSExchangeData data;
   node_data.Write(GetProfilePath(), &data);
 
   // Read the data back in.
   ui::OSExchangeData data2(CloneProvider(data));
   BookmarkNodeData read_data;
   EXPECT_TRUE(read_data.Read(data2));
   EXPECT_TRUE(read_data.is_valid());
-  ASSERT_EQ(1u, read_data.elements.size());
+  ASSERT_EQ(1u, read_data.size());
 
   // Verify that the read data contains the same meta info.
   BookmarkNode::MetaInfoMap meta_info_map = read_data.elements[0].meta_info_map;
   EXPECT_EQ(2u, meta_info_map.size());
   EXPECT_EQ("somevalue", meta_info_map["somekey"]);
   EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]);
 }
 
 }  // namespace bookmarks