Cleanup: Pass std::string as const reference from sync/

Passing std::string by reference can prevent extra copying of object.

BUG=367418
TEST=
R=pavely@chromium.org,stanisc@chromium.org,zea@chromium.org

Review URL: https://codereview.chromium.org/1348313003

Cr-Commit-Position: refs/heads/master@{#350126}

7 files changed, 111 insertions, 93 deletions

diff --git a/sync/test/engine/mock_connection_manager.cc b/sync/test/engine/mock_connection_manager.cc
index ae0b28b..cb07db4 100644
--- a/sync/test/engine/mock_connection_manager.cc
+++ b/sync/test/engine/mock_connection_manager.cc
@@ -61,7 +61,7 @@ MockConnectionManager::~MockConnectionManager() {
   EXPECT_TRUE(update_queue_.empty()) << "Unfetched updates.";
 }
 
-void MockConnectionManager::SetCommitTimeRename(string prepend) {
+void MockConnectionManager::SetCommitTimeRename(const string& prepend) {
   commit_time_rename_prepended_string_ = prepend;
 }
 
@@ -218,11 +218,11 @@ void MockConnectionManager::AddDefaultBookmarkData(sync_pb::SyncEntity* entity,
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateDirectory(
     int id,
     int parent_id,
-    string name,
+    const string& name,
     int64 version,
     int64 sync_ts,
-    std::string originator_cache_guid,
-    std::string originator_client_item_id) {
+    const std::string& originator_cache_guid,
+    const std::string& originator_client_item_id) {
   return AddUpdateDirectory(TestIdFactory::FromNumber(id),
                             TestIdFactory::FromNumber(parent_id),
                             name,
@@ -247,11 +247,13 @@ void MockConnectionManager::SetTransientErrorId(syncable::Id id) {
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateBookmark(
-    int id, int parent_id,
-    string name, int64 version,
+    int id,
+    int parent_id,
+    const string& name,
+    int64 version,
     int64 sync_ts,
-    string originator_client_item_id,
-    string originator_cache_guid) {
+    const string& originator_client_item_id,
+    const string& originator_cache_guid) {
   return AddUpdateBookmark(TestIdFactory::FromNumber(id),
                            TestIdFactory::FromNumber(parent_id),
                            name,
@@ -264,7 +266,7 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdateBookmark(
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateSpecifics(
     int id,
     int parent_id,
-    string name,
+    const string& name,
     int64 version,
     int64 sync_ts,
     bool is_dir,
@@ -283,14 +285,14 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdateSpecifics(
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateSpecifics(
     int id,
     int parent_id,
-    string name,
+    const string& name,
     int64 version,
     int64 sync_ts,
     bool is_dir,
     int64 position,
     const sync_pb::EntitySpecifics& specifics,
-    string originator_cache_guid,
-    string originator_client_item_id) {
+    const string& originator_cache_guid,
+    const string& originator_client_item_id) {
   sync_pb::SyncEntity* ent = AddUpdateSpecifics(
       id, parent_id, name, version, sync_ts, is_dir, position, specifics);
   ent->set_originator_cache_guid(originator_cache_guid);
@@ -319,11 +321,12 @@ sync_pb::SyncEntity* MockConnectionManager::SetNigori(
   return ent;
 }
 
-sync_pb::SyncEntity* MockConnectionManager::AddUpdatePref(string id,
-                                                          string parent_id,
-                                                          string client_tag,
-                                                          int64 version,
-                                                          int64 sync_ts) {
+sync_pb::SyncEntity* MockConnectionManager::AddUpdatePref(
+    const string& id,
+    const string& parent_id,
+    const string& client_tag,
+    int64 version,
+    int64 sync_ts) {
   sync_pb::SyncEntity* ent =
       AddUpdateMeta(id, parent_id, " ", version, sync_ts);
 
@@ -337,9 +340,12 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdatePref(string id,
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateFull(
-    string id, string parent_id,
-    string name, int64 version,
-    int64 sync_ts, bool is_dir) {
+    const string& id,
+    const string& parent_id,
+    const string& name,
+    int64 version,
+    int64 sync_ts,
+    bool is_dir) {
   sync_pb::SyncEntity* ent =
       AddUpdateMeta(id, parent_id, name, version, sync_ts);
   AddDefaultBookmarkData(ent, is_dir);
@@ -347,8 +353,10 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdateFull(
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateMeta(
-    string id, string parent_id,
-    string name, int64 version,
+    const string& id,
+    const string& parent_id,
+    const string& name,
+    int64 version,
     int64 sync_ts) {
   sync_pb::SyncEntity* ent = GetUpdateResponse()->add_entries();
   ent->set_id_string(id);
@@ -377,13 +385,13 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdateMeta(
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateDirectory(
-    string id,
-    string parent_id,
-    string name,
+    const string& id,
+    const string& parent_id,
+    const string& name,
     int64 version,
     int64 sync_ts,
-    std::string originator_cache_guid,
-    std::string originator_client_item_id) {
+    const std::string& originator_cache_guid,
+    const std::string& originator_client_item_id) {
   sync_pb::SyncEntity* ret =
       AddUpdateFull(id, parent_id, name, version, sync_ts, true);
   ret->set_originator_cache_guid(originator_cache_guid);
@@ -392,12 +400,13 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdateDirectory(
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateBookmark(
-    string id,
-    string parent_id,
-    string name, int64 version,
+    const string& id,
+    const string& parent_id,
+    const string& name,
+    int64 version,
     int64 sync_ts,
-    string originator_cache_guid,
-    string originator_client_item_id) {
+    const string& originator_cache_guid,
+    const string& originator_client_item_id) {
   sync_pb::SyncEntity* ret =
       AddUpdateFull(id, parent_id, name, version, sync_ts, false);
   ret->set_originator_cache_guid(originator_cache_guid);
@@ -660,11 +669,11 @@ void MockConnectionManager::ProcessClearServerData(
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateDirectory(
     syncable::Id id,
     syncable::Id parent_id,
-    string name,
+    const string& name,
     int64 version,
     int64 sync_ts,
-    string originator_cache_guid,
-    string originator_client_item_id) {
+    const string& originator_cache_guid,
+    const string& originator_client_item_id) {
   return AddUpdateDirectory(id.GetServerId(), parent_id.GetServerId(),
                             name, version, sync_ts, originator_cache_guid,
                             originator_client_item_id);
@@ -673,11 +682,11 @@ sync_pb::SyncEntity* MockConnectionManager::AddUpdateDirectory(
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateBookmark(
     syncable::Id id,
     syncable::Id parent_id,
-    string name,
+    const string& name,
     int64 version,
     int64 sync_ts,
-    string originator_cache_guid,
-    string originator_client_item_id) {
+    const string& originator_cache_guid,
+    const string& originator_client_item_id) {
   return AddUpdateBookmark(id.GetServerId(), parent_id.GetServerId(),
                            name, version, sync_ts, originator_cache_guid,
                            originator_client_item_id);
diff --git a/sync/test/engine/mock_connection_manager.h b/sync/test/engine/mock_connection_manager.h
index 2ba1304..c09cf87 100644
--- a/sync/test/engine/mock_connection_manager.h
+++ b/sync/test/engine/mock_connection_manager.h
@@ -50,7 +50,7 @@ class MockConnectionManager : public ServerConnectionManager {
 
   // Set this if you want commit to perform commit time rename. Will request
   // that the client renames all commited entries, prepending this string.
-  void SetCommitTimeRename(std::string prepend);
+  void SetCommitTimeRename(const std::string& prepend);
 
   // Generic versions of AddUpdate functions. Tests using these function should
   // compile for both the int64 and string id based versions of the server.
@@ -60,55 +60,58 @@ class MockConnectionManager : public ServerConnectionManager {
   sync_pb::SyncEntity* AddUpdateDirectory(
       syncable::Id id,
       syncable::Id parent_id,
-      std::string name,
+      const std::string& name,
       int64 version,
       int64 sync_ts,
-      std::string originator_cache_guid,
-      std::string originator_client_item_id);
-  sync_pb::SyncEntity* AddUpdateBookmark(syncable::Id id,
-                                         syncable::Id parent_id,
-                                         std::string name,
-                                         int64 version,
-                                         int64 sync_ts,
-                                         std::string originator_cache_guid,
-                                         std::string originator_client_item_id);
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
+  sync_pb::SyncEntity* AddUpdateBookmark(
+      syncable::Id id,
+      syncable::Id parent_id,
+      const std::string& name,
+      int64 version,
+      int64 sync_ts,
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
   // Versions of the AddUpdate functions that accept integer IDs.
   sync_pb::SyncEntity* AddUpdateDirectory(
       int id,
       int parent_id,
-      std::string name,
+      const std::string& name,
+      int64 version,
+      int64 sync_ts,
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
+  sync_pb::SyncEntity* AddUpdateBookmark(
+      int id,
+      int parent_id,
+      const std::string& name,
       int64 version,
       int64 sync_ts,
-      std::string originator_cache_guid,
-      std::string originator_client_item_id);
-  sync_pb::SyncEntity* AddUpdateBookmark(int id,
-                                         int parent_id,
-                                         std::string name,
-                                         int64 version,
-                                         int64 sync_ts,
-                                         std::string originator_cache_guid,
-                                         std::string originator_client_item_id);
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
   // New protocol versions of the AddUpdate functions.
   sync_pb::SyncEntity* AddUpdateDirectory(
-      std::string id,
-      std::string parent_id,
-      std::string name,
+      const std::string& id,
+      const std::string& parent_id,
+      const std::string& name,
       int64 version,
       int64 sync_ts,
-      std::string originator_cache_guid,
-      std::string originator_client_item_id);
-  sync_pb::SyncEntity* AddUpdateBookmark(std::string id,
-                                         std::string parent_id,
-                                         std::string name,
-                                         int64 version,
-                                         int64 sync_ts,
-                                         std::string originator_cache_guid,
-                                         std::string originator_client_item_id);
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
+  sync_pb::SyncEntity* AddUpdateBookmark(
+      const std::string& id,
+      const std::string& parent_id,
+      const std::string& name,
+      int64 version,
+      int64 sync_ts,
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
   // Versions of the AddUpdate function that accept specifics.
   sync_pb::SyncEntity* AddUpdateSpecifics(
       int id,
       int parent_id,
-      std::string name,
+      const std::string& name,
       int64 version,
       int64 sync_ts,
       bool is_dir,
@@ -117,23 +120,23 @@ class MockConnectionManager : public ServerConnectionManager {
   sync_pb::SyncEntity* AddUpdateSpecifics(
       int id,
       int parent_id,
-      std::string name,
+      const std::string& name,
       int64 version,
       int64 sync_ts,
       bool is_dir,
       int64 position,
       const sync_pb::EntitySpecifics& specifics,
-      std::string originator_cache_guid,
-      std::string originator_client_item_id);
+      const std::string& originator_cache_guid,
+      const std::string& originator_client_item_id);
   sync_pb::SyncEntity* SetNigori(
       int id,
       int64 version,
       int64 sync_ts,
       const sync_pb::EntitySpecifics& specifics);
   // Unique client tag variant for adding items.
-  sync_pb::SyncEntity* AddUpdatePref(std::string id,
-                                     std::string parent_id,
-                                     std::string client_tag,
+  sync_pb::SyncEntity* AddUpdatePref(const std::string& id,
+                                     const std::string& parent_id,
+                                     const std::string& client_tag,
                                      int64 version,
                                      int64 sync_ts);
 
@@ -212,7 +215,7 @@ class MockConnectionManager : public ServerConnectionManager {
     use_legacy_bookmarks_protocol_ = value;
   }
 
-  void set_store_birthday(std::string new_birthday) {
+  void set_store_birthday(const std::string& new_birthday) {
     // Multiple threads can set store_birthday_ in our tests, need to lock it to
     // ensure atomic read/writes and avoid race conditions.
     base::AutoLock lock(store_birthday_lock_);
@@ -267,17 +270,23 @@ class MockConnectionManager : public ServerConnectionManager {
   sync_pb::SyncEntity* GetMutableLastUpdate();
 
  private:
-  sync_pb::SyncEntity* AddUpdateFull(syncable::Id id, syncable::Id parentid,
-                                     std::string name, int64 version,
+  sync_pb::SyncEntity* AddUpdateFull(syncable::Id id,
+                                     syncable::Id parentid,
+                                     const std::string& name,
+                                     int64 version,
                                      int64 sync_ts,
                                      bool is_dir);
-  sync_pb::SyncEntity* AddUpdateFull(std::string id,
-                                     std::string parentid, std::string name,
-                                     int64 version, int64 sync_ts,
+  sync_pb::SyncEntity* AddUpdateFull(const std::string& id,
+                                     const std::string& parentid,
+                                     const std::string& name,
+                                     int64 version,
+                                     int64 sync_ts,
                                      bool is_dir);
-  sync_pb::SyncEntity* AddUpdateMeta(std::string id, std::string parentid,
-                                    std::string name, int64 version,
-                                    int64 sync_ts);
+  sync_pb::SyncEntity* AddUpdateMeta(const std::string& id,
+                                     const std::string& parentid,
+                                     const std::string& name,
+                                     int64 version,
+                                     int64 sync_ts);
 
   // Functions to handle the various types of server request.
   void ProcessGetUpdates(sync_pb::ClientToServerMessage* csm,
diff --git a/sync/test/engine/test_id_factory.h b/sync/test/engine/test_id_factory.h
index 3334729..40a3b5b 100644
--- a/sync/test/engine/test_id_factory.h
+++ b/sync/test/engine/test_id_factory.h
@@ -36,12 +36,12 @@ class TestIdFactory {
   }
 
   // Create a local ID from a name.
-  static syncable::Id MakeLocal(std::string name) {
+  static syncable::Id MakeLocal(const std::string& name) {
     return syncable::Id::CreateFromClientString(std::string("lient ") + name);
   }
 
   // Create a server ID from a string name.
-  static syncable::Id MakeServer(std::string name) {
+  static syncable::Id MakeServer(const std::string& name) {
     return syncable::Id::CreateFromServerId(std::string("erver ") + name);
   }
 
diff --git a/sync/test/fake_server/bookmark_entity.cc b/sync/test/fake_server/bookmark_entity.cc
index 7f0b1cb..0c7e537 100644
--- a/sync/test/fake_server/bookmark_entity.cc
+++ b/sync/test/fake_server/bookmark_entity.cc
@@ -94,7 +94,7 @@ BookmarkEntity::BookmarkEntity(
   SetSpecifics(specifics);
 }
 
-void BookmarkEntity::SetParentId(string parent_id) {
+void BookmarkEntity::SetParentId(const string& parent_id) {
   parent_id_ = parent_id;
 }
 
diff --git a/sync/test/fake_server/bookmark_entity.h b/sync/test/fake_server/bookmark_entity.h
index 5f4528d..c146f86 100644
--- a/sync/test/fake_server/bookmark_entity.h
+++ b/sync/test/fake_server/bookmark_entity.h
@@ -49,7 +49,7 @@ class BookmarkEntity : public FakeServerEntity {
                  int64 creation_time,
                  int64 last_modified_time);
 
-  void SetParentId(std::string parent_id);
+  void SetParentId(const std::string& parent_id);
 
   // FakeServerEntity implementation.
   std::string GetParentId() const override;
diff --git a/sync/test/fake_server/fake_server_entity.cc b/sync/test/fake_server/fake_server_entity.cc
index 9d7f6ba..e76daa7 100644
--- a/sync/test/fake_server/fake_server_entity.cc
+++ b/sync/test/fake_server/fake_server_entity.cc
@@ -58,7 +58,7 @@ const std::string& FakeServerEntity::GetName() const {
   return name_;
 }
 
-void FakeServerEntity::SetName(std::string name) {
+void FakeServerEntity::SetName(const std::string& name) {
   name_ = name;
 }
 
diff --git a/sync/test/fake_server/fake_server_entity.h b/sync/test/fake_server/fake_server_entity.h
index ed12096..a1316d1 100644
--- a/sync/test/fake_server/fake_server_entity.h
+++ b/sync/test/fake_server/fake_server_entity.h
@@ -35,7 +35,7 @@ class FakeServerEntity {
   int64 GetVersion() const;
   void SetVersion(int64 version);
   const std::string& GetName() const;
-  void SetName(std::string name);
+  void SetName(const std::string& name);
 
   // Replaces |specifics_| with |updated_specifics|. This method is meant to be
   // used to mimic a client commit.