Index: chrome/browser/bookmarks/bookmark_model.cc |
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc |
index 6f66bdc8beaf61188225a71c2917f20998136153..b44ee90cb96f7ac1023b9c5d013faaf928693322 100644 |
--- a/chrome/browser/bookmarks/bookmark_model.cc |
+++ b/chrome/browser/bookmarks/bookmark_model.cc |
@@ -13,7 +13,6 @@ |
#include "base/sequenced_task_runner.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
-#include "base/values.h" |
#include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h" |
#include "chrome/browser/bookmarks/bookmark_index.h" |
#include "chrome/browser/bookmarks/bookmark_model_observer.h" |
@@ -44,25 +43,6 @@ BookmarkNode* AsMutable(const BookmarkNode* node) { |
return const_cast<BookmarkNode*>(node); |
} |
-// Helper to recursively determine if a Dictionary has any valid values. |
-bool HasValues(const base::DictionaryValue& root) { |
- if (root.empty()) |
- return false; |
- for (base::DictionaryValue::Iterator iter(root); !iter.IsAtEnd(); |
- iter.Advance()) { |
- const base::Value& value = iter.value(); |
- if (value.IsType(base::Value::TYPE_DICTIONARY)) { |
- const base::DictionaryValue* dict_value = NULL; |
- if (value.GetAsDictionary(&dict_value) && HasValues(*dict_value)) |
- return true; |
- } else { |
- // A non dictionary type was encountered, assume it's a valid value. |
- return true; |
- } |
- } |
- return false; |
-} |
- |
// Whitespace characters to strip from bookmark titles. |
const char16 kInvalidChars[] = { |
'\n', '\r', '\t', |
@@ -152,7 +132,6 @@ const BookmarkNode::MetaInfoMap* BookmarkNode::GetMetaInfoMap() const { |
return meta_info_map_.get(); |
} |
- |
void BookmarkNode::Initialize(int64 id) { |
id_ = id; |
type_ = url_.is_empty() ? FOLDER : URL; |