bookmarks: BookmarkNodeData's size() cleanups.

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.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/bookmark_manager_private/bookmark_manager_private_api.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 144 matching lines @@
 
   if (node_data->same_profile) {
     std::vector<const BookmarkNode*> nodes = data.GetNodes(
         BookmarkModelFactory::GetForProfile(profile), profile_path);
     for (size_t i = 0; i < nodes.size(); ++i) {
       node_data->elements.push_back(
           CreateNodeDataElementFromBookmarkNode(*nodes[i]));
     }
   } else {
     // We do not have a node IDs when the data comes from a different profile.
-    std::vector<BookmarkNodeData::Element> elements = data.elements;
-    for (size_t i = 0; i < elements.size(); ++i)
-      node_data->elements.push_back(CreateApiNodeDataElement(elements[i]));
+    for (size_t i = 0; i < data.num_elements(); ++i)
+      node_data->elements.push_back(CreateApiNodeDataElement(data.elements[i]));
   }
   return node_data.Pass();
 }
 
 }  // namespace
 
 BookmarkManagerPrivateEventRouter::BookmarkManagerPrivateEventRouter(
     content::BrowserContext* browser_context,
     BookmarkModel* bookmark_model)
     : browser_context_(browser_context), bookmark_model_(bookmark_model) {
@@ skipping 124 matching lines @@
   EventRouter* event_router = EventRouter::Get(profile_);
   if (!event_router)
     return;
 
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
   event_router->BroadcastEvent(event.Pass());
 }
 
 void BookmarkManagerPrivateDragEventRouter::OnDragEnter(
     const BookmarkNodeData& data) {
-  if (data.size() == 0)
+  if (!data.is_valid())
     return;
   DispatchEvent(bookmark_manager_private::OnDragEnter::kEventName,
                 bookmark_manager_private::OnDragEnter::Create(
                     *CreateApiBookmarkNodeData(profile_, data)));
 }
 
 void BookmarkManagerPrivateDragEventRouter::OnDragOver(
     const BookmarkNodeData& data) {
   // Intentionally empty since these events happens too often and floods the
   // message queue. We do not need this event for the bookmark manager anyway.
 }
 
 void BookmarkManagerPrivateDragEventRouter::OnDragLeave(
     const BookmarkNodeData& data) {
-  if (data.size() == 0)
+  if (!data.is_valid())
     return;
   DispatchEvent(bookmark_manager_private::OnDragLeave::kEventName,
                 bookmark_manager_private::OnDragLeave::Create(
                     *CreateApiBookmarkNodeData(profile_, data)));
 }
 
 void BookmarkManagerPrivateDragEventRouter::OnDrop(
     const BookmarkNodeData& data) {
-  if (data.size() == 0)
+  if (!data.is_valid())
     return;
   DispatchEvent(bookmark_manager_private::OnDrop::kEventName,
                 bookmark_manager_private::OnDrop::Create(
                     *CreateApiBookmarkNodeData(profile_, data)));
 
   // Make a copy that is owned by this instance.
   ClearBookmarkNodeData();
   bookmark_drag_data_ = data;
 }
 
@@ skipping 487 matching lines @@
 
   enhanced_bookmarks::EnhancedBookmarkModel* model =
       enhanced_bookmarks::EnhancedBookmarkModelFactory::GetForBrowserContext(
           browser_context());
   model->SetVersionSuffix(params->version);
 
   return true;
 }
 
 }  // namespace extensions