Revert "Speculative revert by sheriff"

sync/test/fake_server/fake_server.h

 // 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.
 
 #ifndef SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
 #define SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 98 matching lines @@
   // must be called if AddObserver was ever called with |observer|.
   void RemoveObserver(Observer* observer);
 
   // Undoes the effects of DisableNetwork.
   void EnableNetwork();
 
   // Forces every request to fail in a way that simulates a network failure.
   // 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;
 
   // Processes a GetUpdates call.
   bool HandleGetUpdatesRequest(const sync_pb::GetUpdatesMessage& get_updates,
                                sync_pb::GetUpdatesResponse* response);
 
   // Processes a Commit call.
   bool HandleCommitRequest(const sync_pb::CommitMessage& message,
                            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);
 
   // Commits a client-side SyncEntity to the server as a FakeServerEntity.
   // The client that sent the commit is identified via |client_guid|. The
   // parent ID string present in |client_entity| should be ignored in favor
   // of |parent_id|. If the commit is successful, the entity's server ID string
   // is returned and a new FakeServerEntity is saved in |entities_|.
   std::string CommitEntity(
       const sync_pb::SyncEntity& client_entity,
@@ skipping 58 matching lines @@
   ObserverList<Observer, true> observers_;
 
   // When true, the server operates normally. When false, a failure is returned
   // on every request. This is used to simulate a network failure on the client.
   bool network_enabled_;
 };
 
 }  // namespace fake_server
 
 #endif  // SYNC_TEST_FAKE_SERVER_FAKE_SERVER_H_