Revert "Speculative revert by sheriff"

sync/test/fake_server/fake_server.h

Index: sync/test/fake_server/fake_server.h
diff --git a/sync/test/fake_server/fake_server.h b/sync/test/fake_server/fake_server.h
index 78edd9a0b0c412dbed94c44fbbc1021a926b2510..ecc8bd7430b31fec2cd8e498775e68b5a23b03ea 100644
--- a/sync/test/fake_server/fake_server.h
+++ b/sync/test/fake_server/fake_server.h
@@ -116,6 +116,9 @@ class FakeServer {
   // This can be used to trigger exponential backoff in the client.
   void DisableNetwork();
 
+  // Returns the entity ID of the Bookmark Bar folder.
+  std::string GetBookmarkBarFolderId() const;
+
  private:
   typedef std::map<std::string, FakeServerEntity*> EntityMap;
 
@@ -128,14 +131,13 @@ class FakeServer {
                            const std::string& invalidator_client_id,
                            sync_pb::CommitResponse* response);
 
-  bool CreatePermanentBookmarkFolder(const char* server_tag, const char* name);
+  // Creates and saves a permanent folder for Bookmarks (e.g., Bookmark Bar).
+  bool CreatePermanentBookmarkFolder(const std::string& server_tag,
+                                     const std::string& name);
 
   // Inserts the default permanent items in |entities_|.
   bool CreateDefaultPermanentItems();
 
-  // Inserts the mobile bookmarks folder entity in |entities_|.
-  bool CreateMobileBookmarksPermanentItem();
-
   // Saves a |entity| to |entities_|.
   void SaveEntity(FakeServerEntity* entity);