Always add bookmarks to the mobile node on Android

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 <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 480 matching lines @@
     model->Remove(node);
   }
 }
 
 void AddIfNotBookmarked(BookmarkModel* model,
                         const GURL& url,
                         const base::string16& title) {
   if (IsBookmarkedByUser(model, url))
     return;  // Nothing to do, a user bookmark with that url already exists.
   model->client()->RecordAction(base::UserMetricsAction("BookmarkAdded"));
-  const BookmarkNode* parent = model->GetParentForNewNodes();
+  const BookmarkNode* parent = GetParentForNewNodes(model);
   model->AddURL(parent, parent->child_count(), title, url);
 }
 
 void RemoveAllBookmarks(BookmarkModel* model, const GURL& url) {
   std::vector<const BookmarkNode*> bookmarks;
   model->GetNodesByURL(url, &bookmarks);
 
   // Remove all the user bookmarks.
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
@@ skipping 50 matching lines @@
 
 bool HasDescendantsOf(const std::vector<const BookmarkNode*>& list,
                       const BookmarkNode* root) {
   for (const BookmarkNode* node : list) {
     if (IsDescendantOf(node, root))
       return true;
   }
   return false;
 }
 
+bool HasUserCreatedBookmarks(BookmarkModel* model) {

[sky, 2016/10/11 19:13:39]

Move this to anonymous namespace.

[kraush, 2016/10/11 21:22:39]

Will do.

+  const BookmarkNode* root_node = model->root_node();
+
+  for (int i = 0; i < root_node->child_count(); ++i) {
+    const BookmarkNode* node = root_node->GetChild(i);
+    if (node->IsVisible() && model->client()->CanBeEditedByUser(node) &&

[sky, 2016/10/11 19:13:39]

Can't you just check child_count() here?

[kraush, 2016/10/11 21:22:39]

I wanted to be super-safe, but it's probably unnecessary. Will reduce to just
the count.

+        node->child_count() > 0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+const BookmarkNode* GetParentForNewNodes(BookmarkModel* model) {
+#if defined(OS_ANDROID)
+  if (!HasUserCreatedBookmarks(model)) {

[sky, 2016/10/11 19:13:39]

no {} (see style guide)

[kraush, 2016/10/11 21:22:39]

Removed.

+    return model->mobile_node();
+  }
+#endif
+  std::vector<const BookmarkNode*> nodes =
+      GetMostRecentlyModifiedUserFolders(model, 1);
+  DCHECK(!nodes.empty());  // This list is always padded with default folders.
+  return nodes[0];
+}
+
 }  // namespace bookmarks