Only set remote id during url node creation.

components/enhanced_bookmarks/enhanced_bookmark_model_unittest.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/enhanced_bookmarks/enhanced_bookmark_model.h"
 
 #include "base/base64.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 30 matching lines @@
   const BookmarkNode* AddBookmark() {
     return AddBookmark("Some title", bookmark_model_->other_node());
   }
 
   const BookmarkNode* AddFolder() {
     return AddFolder("Some title", bookmark_model_->other_node());
   }
 
   const BookmarkNode* AddBookmark(const std::string& name,
                                   const BookmarkNode* parent) {
-    return bookmark_model_->AddURL(parent,
-                                   0,  // index.
-                                   base::ASCIIToUTF16(name),
-                                   GURL(BOOKMARK_URL));
+    return model_->AddURL(parent,
+                          0,  // index.
+                          base::ASCIIToUTF16(name),
+                          GURL(BOOKMARK_URL),
+                          base::Time::Now());
   }
 
   const BookmarkNode* AddFolder(const std::string& name,
                                 const BookmarkNode* parent) {
-    return bookmark_model_->AddFolder(parent, 0, base::ASCIIToUTF16(name));
+    return model_->AddFolder(parent, 0, base::ASCIIToUTF16(name));
   }
 
   std::string GetVersionForNode(const BookmarkNode* node) {
     std::string version;
     if (!node->GetMetaInfo("stars.version", &version))
       return std::string();
     return version;
   }
 
   scoped_ptr<BookmarkModel> bookmark_model_;
@@ skipping 204 matching lines @@
   result = model_->GetOriginalImage(node, &url, &width, &height);
   ASSERT_TRUE(result);
   EXPECT_EQ(url, GURL("http://example.com/i.jpg"));
   EXPECT_EQ(width, 33);
   EXPECT_EQ(height, 44);
   EXPECT_EQ("v1.0", GetVersionForNode(node));
 }
 
 TEST_F(EnhancedBookmarkModelTest, TestRemoteId) {
   const BookmarkNode* node = AddBookmark();
+  // Verify that the remote id starts with the correct prefix.
+  EXPECT_TRUE(StartsWithASCII(model_->GetRemoteId(node), "ebc_", true));
+
+  // Getting the remote id for nodes that don't have them should return the
+  // empty string.
+  const BookmarkNode* existing_node =
+      bookmark_model_->AddURL(bookmark_model_->other_node(),
+                              0,
+                              base::ASCIIToUTF16("Title"),
+                              GURL(GURL(BOOKMARK_URL)));
+  EXPECT_TRUE(model_->GetRemoteId(existing_node).empty());
+
+  // Folder nodes should not have a remote id set on creation.
   const BookmarkNode* folder_node = AddFolder();
-
-  std::string remote_id = model_->GetRemoteId(node);
-  // First call creates the UUID, second call should return the same.
-  EXPECT_EQ(remote_id, model_->GetRemoteId(node));
-
-  // Verify that the remote id starts with the correct prefix.
-  EXPECT_TRUE(StartsWithASCII(remote_id, "ebc_", true));
-  std::string folder_remote_id = model_->GetRemoteId(folder_node);
-  EXPECT_TRUE(StartsWithASCII(folder_remote_id, "ebf_", true));
-
-  // Verifiy version field was set.
-  EXPECT_EQ("v1.0", GetVersionForNode(node));
-  EXPECT_EQ("v1.0", GetVersionForNode(folder_node));
+  EXPECT_TRUE(model_->GetRemoteId(folder_node).empty());
 }
 
 TEST_F(EnhancedBookmarkModelTest, TestEmptyDescription) {
   const BookmarkNode* node = AddBookmark();
 
   std::string description(model_->GetDescription(node));
   EXPECT_EQ(description, "");
 }
 
 TEST_F(EnhancedBookmarkModelTest, TestDescription) {
@@ skipping 50 matching lines @@
   model_->SetVersionSuffix("alpha");
 
   model_->SetDescription(node, "foo");
   // Since the description didn't actually change, the version field should
   // not either.
   EXPECT_EQ("v1.0", GetVersionForNode(node));
 
   model_->SetDescription(node, "bar");
   EXPECT_EQ("v1.0/alpha", GetVersionForNode(node));
 }
-
-// Verifies that the stars.userEdit field is set appropriately when editing a
-// node.
-TEST_F(EnhancedBookmarkModelTest, TestUserEdit) {
-  const BookmarkNode* node = AddBookmark();
-
-  model_->SetDescription(node, "foo");
-  std::string user_edit;
-  ASSERT_TRUE(node->GetMetaInfo("stars.userEdit", &user_edit));
-  EXPECT_EQ("true", user_edit);
-}
-
 }  // namespace