Title: Same Bookmark url is getting pasted on the Bookmarkbar with same title.

components/bookmarks/browser/bookmark_utils.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 "components/bookmarks/browser/bookmark_utils.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/string_search.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/prefs/pref_service.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/query_parser/query_parser.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard.h"
@@ skipping 186 matching lines @@
     GURL url = GetUrlFromClipboard();
     if (!url.is_valid())
       return;
     BookmarkNode node(url);
     node.SetTitle(base::ASCIIToUTF16(url.spec()));
     bookmark_data = BookmarkNodeData(&node);
   }
   if (index == -1)
     index = parent->child_count();
   ScopedGroupBookmarkActions group_paste(model);
+
+  if (bookmark_data.elements.size() == 1 &&

[sky, 2014/09/24 14:26:49]

Move this into a helper function.

[Deepak, 2014/09/25 05:59:11]

Done.

+      model->IsBookmarked(bookmark_data.elements[0].url)) {
+    std::vector<const BookmarkNode*> nodes;

[sky, 2014/09/24 14:26:49]

AFAICT you don't need this.

[Deepak, 2014/09/25 05:59:11]

Acknowledged.

+    std::vector<base::string16> titles;

[sky, 2014/09/24 14:26:49]

Use a hashset.

[Deepak, 2014/09/25 05:59:11]

For using HashSet, I have added 
third_party/WebKit/Source/wtf/HashSet.h header.
But as HashSet internally have 
#include "wtf/DefaultAllocator.h"
#include "wtf/HashTable.h"

I am getting compilation error for HashSet usage in bookmark_utils.cc file. I
tried to get HashSet usage in Bookmarks code for reference, but unable to find
that code. so I am using vector here again.

[sky, 2014/09/26 16:14:10]

Don't use webkit types in chrome. Use the types in base.

+    std::vector<base::string16>::iterator it;

[sky, 2014/09/24 14:26:49]

Declare where needed.

[Deepak, 2014/09/25 05:59:11]

Done.

+    base::string16 new_title = bookmark_data.elements[0].title;
+
+    for (int i = 0; i < parent->child_count(); i++) {
+      const BookmarkNode* node = parent->GetChild(i);
+      if (node->is_url() && (bookmark_data.elements[0].url == node->url()) &&
+          (new_title == node->GetTitle() ||
+           StartsWith(node->GetTitle(), new_title, false))) {
+        titles.push_back(node->GetTitle());
+        nodes.push_back(node);
+      }
+    }
+
+    it = std::find(titles.begin(), titles.end(), new_title);
+    if (it == titles.end()) {
+      new_title = bookmark_data.elements[0].title;
+    } else {
+      for (size_t i = 0; i < nodes.size(); i++) {
+        new_title = bookmark_data.elements[0].title + base::UTF8ToUTF16("(") +

[sky, 2014/09/24 14:26:49]

Use StringPrintf.

[Deepak, 2014/09/25 05:59:11]

Done.

+                    base::IntToString16(i + 1) + base::UTF8ToUTF16(")");
+        it = std::find(titles.begin(), titles.end(), new_title);
+        if (it == titles.end())
+          break;
+      }
+    }
+    bookmark_data.elements[0].title = new_title;
+  }
+
   CloneBookmarkNode(model, bookmark_data.elements, parent, index, true);
 }
 
 bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node) {
   if (!node || !model->client()->CanBeEditedByUser(node))
     return false;
   return (BookmarkNodeData::ClipboardContainsBookmarks() ||
           GetUrlFromClipboard().is_valid());
 }
 
@@ skipping 224 matching lines @@
   }
   return false;
 }
 
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id) {
   // TODO(sky): TreeNode needs a method that visits all nodes using a predicate.
   return GetNodeByID(model->root_node(), id);
 }
 
 }  // namespace bookmarks