bookmarks: BookmarkNodeData's size() cleanups.

components/bookmarks/browser/bookmark_node_data.h

 // 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 132 matching lines @@
 
   // Convenience for getting the first node. Returns NULL if the data doesn't
   // match any nodes or there is more than one node.
   const BookmarkNode* GetFirstNode(BookmarkModel* model,
                                    const base::FilePath& profile_path) const;
 
   // Do we contain valid data?
   bool is_valid() const { return !elements.empty(); }
 
   // Returns true if there is a single url.
-  bool has_single_url() const { return is_valid() && elements[0].is_url; }
+  bool has_single_url() const { return size() == 1 && elements[0].is_url; }
 
   // Number of elements.
   size_t size() const { return elements.size(); }
 
   // Clears the data.
   void Clear();
 
   // Sets |profile_path_|. This is useful for the constructors/readers that
   // don't set it. This should only be called if the profile path is not
   // already set.
   void SetOriginatingProfilePath(const base::FilePath& profile_path);
 
   // Returns true if this data is from the specified profile path.
   bool IsFromProfilePath(const base::FilePath& profile_path) const;
 
   // The actual elements written to the clipboard.
   std::vector<Element> elements;
 
  private:
   // Path of the profile we originated from.
   base::FilePath profile_path_;
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_