[cros search service] Change id from string16 to string.

Following discussions with our clients, we believe string type of id
will be sufficient. Search tags will continue to be string16 for
multi-language support.

Bug: 1018613
Change-Id: Id45aac55d61aaf2885a2a752ddf56cbcea15cda7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090552Reviewed-by: Thanh Nguyen <thanhdng@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Jia Meng <jiameng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747558}

chrome/services/local_search_service/index_impl.cc

@@ -97,7 +97,7 @@ void IndexImpl::AddOrUpdate(std::vector<mojom::DataPtr> data,
   std::move(callback).Run();
 }
 
-void IndexImpl::Delete(const std::vector<base::string16>& ids,
+void IndexImpl::Delete(const std::vector<std::string>& ids,
                        DeleteCallback callback) {
   uint32_t num_deleted = 0u;
   for (const auto& id : ids) {

chrome/services/local_search_service/index_impl.h

@@ -7,6 +7,7 @@
 
 #include <map>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ -40,7 +41,7 @@ class IndexImpl : public mojom::Index {
   void AddOrUpdate(std::vector<mojom::DataPtr> data,
                    AddOrUpdateCallback callback) override;
 
-  void Delete(const std::vector<base::string16>& ids,
+  void Delete(const std::vector<std::string>& ids,
               DeleteCallback callback) override;
 
   void Find(const base::string16& query,
@@ -63,7 +64,7 @@ class IndexImpl : public mojom::Index {
       const base::string16& query) const;
 
   // A map from key to tokenized search-tags.
-  std::map<base::string16, std::vector<std::unique_ptr<TokenizedString>>> data_;
+  std::map<std::string, std::vector<std::unique_ptr<TokenizedString>>> data_;
 
   mojo::ReceiverSet<mojom::Index> receivers_;
 

chrome/services/local_search_service/local_search_service_impl_unittest.cc

@@ -113,8 +113,7 @@ TEST_F(LocalSearchServiceImplTest, UpdateData) {
 
   // Add "id3" to the index.
   mojom::DataPtr data_id3 = mojom::Data::New(
-      base::UTF8ToUTF16("id3"),
-      std::vector<base::string16>({base::UTF8ToUTF16("tag3a")}));
+      "id3", std::vector<base::string16>({base::UTF8ToUTF16("tag3a")}));
   std::vector<mojom::DataPtr> data_to_update;
   data_to_update.push_back(std::move(data_id3));
   AddOrUpdateAndCheck(index_remote.get(), std::move(data_to_update));

chrome/services/local_search_service/public/mojom/local_search_service.mojom

@@ -39,7 +39,7 @@ interface Index {
   // Deletes data with |ids| and returns number of items deleted.
   // If an id doesn't exist in the Index, no operation will be done.
   // Only the primary client should be allowed to do this operation.
-  Delete(array<mojo_base.mojom.String16> ids) => (uint32 num_deleted);
+  Delete(array<string> ids) => (uint32 num_deleted);
 
   // Takes an asynchronous search request call and returns results and status
   // code via a callback.

chrome/services/local_search_service/public/mojom/types.mojom

@@ -21,7 +21,7 @@ struct Data {
   // identifiers.
   // Ideally IDs should persist across sessions, but this is not strictly
   // required now because data is not persisted across sessions.
-  mojo_base.mojom.String16 id;
+  string id;
 
   // Data item will be matched between its search tags and query term.
   array<mojo_base.mojom.String16> search_tags;
@@ -31,7 +31,7 @@ struct Data {
 // and its matching score.
 struct Result {
   // Id of the data.
-  mojo_base.mojom.String16 id;
+  string id;
   // Relevance score, in the range of [0,1].
   double score;
   // Matching ranges.

chrome/services/local_search_service/test_utils.cc

@@ -29,7 +29,7 @@ std::vector<mojom::DataPtr> CreateTestData(
   std::vector<mojom::DataPtr> output;
   for (const auto& item : input) {
     const std::vector<base::string16> tags = MultiUTF8ToUTF16(item.second);
-    mojom::DataPtr data = mojom::Data::New(base::UTF8ToUTF16(item.first), tags);
+    mojom::DataPtr data = mojom::Data::New(item.first, tags);
     output.push_back(std::move(data));
   }
   return output;
@@ -53,7 +53,7 @@ void DeleteAndCheck(mojom::Index* index,
                     uint32_t expected_num_deleted) {
   DCHECK(index);
   uint32_t num_deleted = 0u;
-  mojom::IndexAsyncWaiter(index).Delete(MultiUTF8ToUTF16(ids), &num_deleted);
+  mojom::IndexAsyncWaiter(index).Delete(ids, &num_deleted);
   EXPECT_EQ(num_deleted, expected_num_deleted);
 }
 
@@ -77,7 +77,7 @@ void FindAndCheck(mojom::Index* index,
     // If results are returned, check size and values match the expected.
     EXPECT_EQ(results->size(), expected_result_ids.size());
     for (size_t i = 0; i < results->size(); ++i) {
-      EXPECT_EQ((*results)[i]->id, base::UTF8ToUTF16(expected_result_ids[i]));
+      EXPECT_EQ((*results)[i]->id, expected_result_ids[i]);
       // Scores should be non-increasing.
       if (i < results->size() - 1) {
         EXPECT_GE((*results)[i]->score, (*results)[i + 1]->score);