Revert "Speculative revert by sheriff"

sync/test/fake_server/bookmark_entity_builder.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 "sync/test/fake_server/bookmark_entity_builder.h"
 
 #include <string>
 
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
     const string& originator_client_item_id)
     : EntityBuilder(syncer::BOOKMARKS, title),
       url_(url),
       originator_cache_guid_(originator_cache_guid),
       originator_client_item_id_(originator_client_item_id) {
 }
 
 BookmarkEntityBuilder::~BookmarkEntityBuilder() {
 }
 
+void BookmarkEntityBuilder::SetParentId(const std::string& parent_id) {
+  parent_id_ = parent_id;
+}
+
 scoped_ptr<FakeServerEntity> BookmarkEntityBuilder::Build() {
   if (!url_.is_valid()) {
     return make_scoped_ptr<FakeServerEntity>(NULL);
   }
 
   sync_pb::EntitySpecifics entity_specifics;
   sync_pb::BookmarkSpecifics* bookmark_specifics =
       entity_specifics.mutable_bookmark();
   bookmark_specifics->set_title(name_);
   bookmark_specifics->set_url(url_.spec());
 
   sync_pb::UniquePosition unique_position;
   // TODO(pvalenzuela): Allow caller customization of the position integer.
   string suffix = GenerateSyncableBookmarkHash(originator_cache_guid_,
                                                originator_client_item_id_);
   syncer::UniquePosition::FromInt64(0, suffix).ToProto(&unique_position);
 
+  if (parent_id_.empty()) {
+    parent_id_ = FakeServerEntity::CreateId(syncer::BOOKMARKS, "bookmark_bar");
+  }
+
   return make_scoped_ptr<FakeServerEntity>(
       new BookmarkEntity(id_,
                          kUnusedVersion,
                          name_,
                          originator_cache_guid_,
                          originator_client_item_id_,
                          unique_position,
                          entity_specifics,
                          // TODO(pvalenzuela): Support bookmark folders.
                          false,
-                         // TODO(pvalenzuela): Support caller specification of
-                         // the parent bookmark folder.
-                         FakeServerEntity::CreateId(syncer::BOOKMARKS,
-                                                    "bookmark_bar"),
+                         parent_id_,
                          kDefaultTime,
                          kDefaultTime));
 }
 
 }  // namespace fake_server