[local-search-service] Rename local search service proxy

Rename local search service proxy for the new LSS.
Please see go/lss-sandboxing-impl for more details

Bug: 1137560
Change-Id: I92a9b38f425462f6b771e835f6afd0cc4666b3a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500382Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Rachel Carpenter <carpenterr@chromium.org>
Reviewed-by: Jia Meng <jiameng@chromium.org>
Commit-Queue: Thanh Nguyen <thanhdng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821503}

chrome/browser/chrome_browser_interface_binders.cc

@@ -733,8 +733,8 @@ void PopulateChromeWebUIFrameBinders(
                                          chromeos::HelpAppUI>(map);
 
   RegisterWebUIControllerInterfaceBinder<
-      chromeos::local_search_service::mojom::IndexProxy, chromeos::HelpAppUI>(
-      map);
+      chromeos::local_search_service::mojom::IndexSyncProxy,
+      chromeos::HelpAppUI>(map);
 
   RegisterWebUIControllerInterfaceBinder<
       media_app_ui::mojom::PageHandlerFactory, chromeos::MediaAppUI>(map);

chromeos/components/help_app_ui/help_app_ui.cc

@@ -9,8 +9,8 @@
 #include "chromeos/components/help_app_ui/help_app_page_handler.h"
 #include "chromeos/components/help_app_ui/help_app_untrusted_ui.h"
 #include "chromeos/components/help_app_ui/url_constants.h"
-#include "chromeos/components/local_search_service/local_search_service_proxy.h"
-#include "chromeos/components/local_search_service/local_search_service_proxy_factory.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy_factory.h"
 #include "chromeos/components/local_search_service/mojom/types.mojom.h"
 #include "chromeos/grit/chromeos_help_app_resources.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
@@ -91,9 +91,9 @@ void HelpAppUI::BindInterface(
 }
 
 void HelpAppUI::BindInterface(
-    mojo::PendingReceiver<chromeos::local_search_service::mojom::IndexProxy>
+    mojo::PendingReceiver<chromeos::local_search_service::mojom::IndexSyncProxy>
         index_receiver) {
-  chromeos::local_search_service::LocalSearchServiceProxyFactory::
+  chromeos::local_search_service::LocalSearchServiceSyncProxyFactory::
       GetForBrowserContext(web_ui()->GetWebContents()->GetBrowserContext())
           ->GetIndex(chromeos::local_search_service::IndexId::kHelpApp,
                      chromeos::local_search_service::Backend::kInvertedIndex,

chromeos/components/help_app_ui/help_app_ui.h

@@ -9,7 +9,7 @@
 
 #include "chromeos/components/help_app_ui/help_app_ui.mojom.h"
 #include "chromeos/components/help_app_ui/help_app_ui_delegate.h"
-#include "chromeos/components/local_search_service/local_search_service_proxy.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "ui/webui/mojo_web_ui_controller.h"
 
@@ -32,7 +32,7 @@ class HelpAppUI : public ui::MojoWebUIController,
       mojo::PendingReceiver<help_app_ui::mojom::PageHandlerFactory> receiver);
 
   void BindInterface(
-      mojo::PendingReceiver<local_search_service::mojom::IndexProxy>
+      mojo::PendingReceiver<local_search_service::mojom::IndexSyncProxy>
           index_receiver);
 
   HelpAppUIDelegate* delegate() { return delegate_.get(); }

chromeos/components/help_app_ui/resources/browser_proxy.js

@@ -11,8 +11,9 @@ helpAppUi.mojom.PageHandlerFactory.getRemote().createPageHandler(
     help_app.handler.$.bindNewPipeAndPassReceiver());
 
 // Set up an index remote to talk to Local Search Service.
-/** @type {!chromeos.localSearchService.mojom.IndexProxyRemote} */
-const indexRemote = chromeos.localSearchService.mojom.IndexProxy.getRemote();
+/** @type {!chromeos.localSearchService.mojom.IndexSyncProxyRemote} */
+const indexRemote =
+    chromeos.localSearchService.mojom.IndexSyncProxy.getRemote();
 
 const GUEST_ORIGIN = 'chrome-untrusted://help-app';
 const guestFrame =

chromeos/components/local_search_service/BUILD.gn

@@ -48,12 +48,12 @@ source_set("local_search_service") {
 
 source_set("local_search_service_proxy") {
   sources = [
-    "index_proxy.cc",
-    "index_proxy.h",
-    "local_search_service_proxy.cc",
-    "local_search_service_proxy.h",
-    "local_search_service_proxy_factory.cc",
-    "local_search_service_proxy_factory.h",
+    "index_sync_proxy.cc",
+    "index_sync_proxy.h",
+    "local_search_service_sync_proxy.cc",
+    "local_search_service_sync_proxy.h",
+    "local_search_service_sync_proxy_factory.cc",
+    "local_search_service_sync_proxy_factory.h",
   ]
 
   deps = [
@@ -92,7 +92,7 @@ source_set("unit_tests") {
     "inverted_index_search_unittest.cc",
     "inverted_index_unittest.cc",
     "linear_map_search_unittest.cc",
-    "local_search_service_proxy_unittest.cc",
+    "local_search_service_sync_proxy_unittest.cc",
     "local_search_service_sync_unittest.cc",
     "search_metrics_reporter_sync_unittest.cc",
     "search_utils_unittest.cc",

chromeos/components/local_search_service/index_proxy.cc → chromeos/components/local_search_service/index_sync_proxy.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/components/local_search_service/index_proxy.h"
+#include "chromeos/components/local_search_service/index_sync_proxy.h"
 
 #include "base/optional.h"
 #include "chromeos/components/local_search_service/index_sync.h"
@@ -10,37 +10,37 @@
 namespace chromeos {
 namespace local_search_service {
 
-IndexProxy::IndexProxy(IndexSync* index) : index_(index) {
+IndexSyncProxy::IndexSyncProxy(IndexSync* index) : index_(index) {
   DCHECK(index_);
 }
 
-IndexProxy::~IndexProxy() = default;
+IndexSyncProxy::~IndexSyncProxy() = default;
 
-void IndexProxy::BindReceiver(
-    mojo::PendingReceiver<mojom::IndexProxy> receiver) {
+void IndexSyncProxy::BindReceiver(
+    mojo::PendingReceiver<mojom::IndexSyncProxy> receiver) {
   receivers_.Add(this, std::move(receiver));
 }
 
-void IndexProxy::GetSize(GetSizeCallback callback) {
+void IndexSyncProxy::GetSize(GetSizeCallback callback) {
   const uint64_t num_items = index_->GetSizeSync();
   std::move(callback).Run(num_items);
 }
 
-void IndexProxy::AddOrUpdate(const std::vector<Data>& data,
-                             AddOrUpdateCallback callback) {
+void IndexSyncProxy::AddOrUpdate(const std::vector<Data>& data,
+                                 AddOrUpdateCallback callback) {
   index_->AddOrUpdateSync(data);
   std::move(callback).Run();
 }
 
-void IndexProxy::Delete(const std::vector<std::string>& ids,
-                        DeleteCallback callback) {
+void IndexSyncProxy::Delete(const std::vector<std::string>& ids,
+                            DeleteCallback callback) {
   const uint64_t num_deleted = index_->DeleteSync(ids);
   std::move(callback).Run(num_deleted);
 }
 
-void IndexProxy::Find(const base::string16& query,
-                      uint32_t max_results,
-                      FindCallback callback) {
+void IndexSyncProxy::Find(const base::string16& query,
+                          uint32_t max_results,
+                          FindCallback callback) {
   std::vector<Result> results;
   ResponseStatus status = index_->FindSync(query, max_results, &results);
   if (status != ResponseStatus::kSuccess) {
@@ -50,7 +50,7 @@ void IndexProxy::Find(const base::string16& query,
   }
 }
 
-void IndexProxy::ClearIndex(ClearIndexCallback callback) {
+void IndexSyncProxy::ClearIndex(ClearIndexCallback callback) {
   index_->ClearIndexSync();
   std::move(callback).Run();
 }

chromeos/components/local_search_service/index_proxy.h → chromeos/components/local_search_service/index_sync_proxy.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_INDEX_PROXY_H_
-#define CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_INDEX_PROXY_H_
+#ifndef CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_INDEX_SYNC_PROXY_H_
+#define CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_INDEX_SYNC_PROXY_H_
 
 #include <vector>
 
@@ -17,14 +17,14 @@ namespace local_search_service {
 
 class IndexSync;
 
-class IndexProxy : public mojom::IndexProxy {
+class IndexSyncProxy : public mojom::IndexSyncProxy {
  public:
-  explicit IndexProxy(IndexSync* index);
-  ~IndexProxy() override;
+  explicit IndexSyncProxy(IndexSync* index);
+  ~IndexSyncProxy() override;
 
-  void BindReceiver(mojo::PendingReceiver<mojom::IndexProxy> receiver);
+  void BindReceiver(mojo::PendingReceiver<mojom::IndexSyncProxy> receiver);
 
-  // mojom::IndexProxy:
+  // mojom::IndexSyncProxy:
   void GetSize(GetSizeCallback callback) override;
   void AddOrUpdate(const std::vector<Data>& data,
                    AddOrUpdateCallback callback) override;
@@ -37,10 +37,10 @@ class IndexProxy : public mojom::IndexProxy {
 
  private:
   IndexSync* const index_;
-  mojo::ReceiverSet<mojom::IndexProxy> receivers_;
+  mojo::ReceiverSet<mojom::IndexSyncProxy> receivers_;
 };
 
 }  // namespace local_search_service
 }  // namespace chromeos
 
-#endif  // CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_INDEX_PROXY_H_
+#endif  // CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_INDEX_SYNC_PROXY_H_

chromeos/components/local_search_service/local_search_service_proxy.cc → chromeos/components/local_search_service/local_search_service_sync_proxy.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/components/local_search_service/local_search_service_proxy.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy.h"
 
-#include "chromeos/components/local_search_service/index_proxy.h"
+#include "chromeos/components/local_search_service/index_sync_proxy.h"
 #include "chromeos/components/local_search_service/local_search_service_sync.h"
 #include "chromeos/components/local_search_service/shared_structs.h"
 #include "components/prefs/pref_service.h"
@@ -12,36 +12,37 @@
 namespace chromeos {
 namespace local_search_service {
 
-LocalSearchServiceProxy::LocalSearchServiceProxy(
+LocalSearchServiceSyncProxy::LocalSearchServiceSyncProxy(
     local_search_service::LocalSearchServiceSync* local_search_service)
     : service_(local_search_service) {
   DCHECK(service_);
 }
 
-LocalSearchServiceProxy::~LocalSearchServiceProxy() = default;
+LocalSearchServiceSyncProxy::~LocalSearchServiceSyncProxy() = default;
 
-void LocalSearchServiceProxy::GetIndex(
+void LocalSearchServiceSyncProxy::GetIndex(
     IndexId index_id,
     Backend backend,
-    mojo::PendingReceiver<mojom::IndexProxy> index_receiver) {
+    mojo::PendingReceiver<mojom::IndexSyncProxy> index_receiver) {
   GetIndex(index_id, backend, nullptr, std::move(index_receiver));
 }
 
-void LocalSearchServiceProxy::GetIndex(
+void LocalSearchServiceSyncProxy::GetIndex(
     IndexId index_id,
     Backend backend,
     PrefService* local_state,
-    mojo::PendingReceiver<mojom::IndexProxy> index_receiver) {
+    mojo::PendingReceiver<mojom::IndexSyncProxy> index_receiver) {
   auto it = indices_.find(index_id);
   if (it == indices_.end()) {
     IndexSync* index = service_->GetIndexSync(index_id, backend, local_state);
-    it = indices_.emplace(index_id, std::make_unique<IndexProxy>(index)).first;
+    it = indices_.emplace(index_id, std::make_unique<IndexSyncProxy>(index))
+             .first;
   }
   it->second->BindReceiver(std::move(index_receiver));
 }
 
-void LocalSearchServiceProxy::BindReceiver(
-    mojo::PendingReceiver<mojom::LocalSearchServiceProxy> receiver) {
+void LocalSearchServiceSyncProxy::BindReceiver(
+    mojo::PendingReceiver<mojom::LocalSearchServiceSyncProxy> receiver) {
   receivers_.Add(this, std::move(receiver));
 }
 

chromeos/components/local_search_service/local_search_service_proxy.h → chromeos/components/local_search_service/local_search_service_sync_proxy.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_PROXY_H_
-#define CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_PROXY_H_
+#ifndef CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_SYNC_PROXY_H_
+#define CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_SYNC_PROXY_H_
 
 #include <map>
 
@@ -18,48 +18,49 @@ namespace chromeos {
 namespace local_search_service {
 
 class LocalSearchServiceSync;
-class IndexProxy;
+class IndexSyncProxy;
 enum class IndexId;
 enum class Backend;
 
-class LocalSearchServiceProxy : public mojom::LocalSearchServiceProxy,
-                                public KeyedService {
+class LocalSearchServiceSyncProxy : public mojom::LocalSearchServiceSyncProxy,
+                                    public KeyedService {
  public:
-  explicit LocalSearchServiceProxy(
+  explicit LocalSearchServiceSyncProxy(
       LocalSearchServiceSync* local_search_service);
-  ~LocalSearchServiceProxy() override;
+  ~LocalSearchServiceSyncProxy() override;
 
-  LocalSearchServiceProxy(const LocalSearchServiceProxy&) = delete;
-  LocalSearchServiceProxy& operator=(const LocalSearchServiceProxy) = delete;
+  LocalSearchServiceSyncProxy(const LocalSearchServiceSyncProxy&) = delete;
+  LocalSearchServiceSyncProxy& operator=(const LocalSearchServiceSyncProxy) =
+      delete;
 
-  // mojom::LocalSearchServiceProxy:
+  // mojom::LocalSearchServiceSyncProxy:
   void GetIndex(
       IndexId index_id,
       Backend backend,
-      mojo::PendingReceiver<mojom::IndexProxy> index_receiver) override;
+      mojo::PendingReceiver<mojom::IndexSyncProxy> index_receiver) override;
 
   void BindReceiver(
-      mojo::PendingReceiver<mojom::LocalSearchServiceProxy> receiver);
+      mojo::PendingReceiver<mojom::LocalSearchServiceSyncProxy> receiver);
 
   // The version below allows an out-of-process client to directly obtain an
   // Index using their own delegate that runs in C++.
   // 1. Client's delegate obtains LocalSearchServicProxy from
-  // LocalSearchServiceProxyFactory.
+  // LocalSearchServiceSyncProxyFactory.
   // 2. Client's delegate calls GetIndex to obtain an Index and binds the
-  // IndexProxy remote
-  //    to the IndexProxy implementation.
+  // IndexSyncProxy remote
+  //    to the IndexSyncProxy implementation.
   void GetIndex(IndexId index_id,
                 Backend backend,
                 PrefService* local_state,
-                mojo::PendingReceiver<mojom::IndexProxy> index_receiver);
+                mojo::PendingReceiver<mojom::IndexSyncProxy> index_receiver);
 
  private:
   LocalSearchServiceSync* const service_;
-  mojo::ReceiverSet<mojom::LocalSearchServiceProxy> receivers_;
-  std::map<IndexId, std::unique_ptr<IndexProxy>> indices_;
+  mojo::ReceiverSet<mojom::LocalSearchServiceSyncProxy> receivers_;
+  std::map<IndexId, std::unique_ptr<IndexSyncProxy>> indices_;
 };
 
 }  // namespace local_search_service
 }  // namespace chromeos
 
-#endif  // CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_PROXY_H_
+#endif  // CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_SYNC_PROXY_H_

chromeos/components/local_search_service/local_search_service_proxy_factory.cc → chromeos/components/local_search_service/local_search_service_sync_proxy_factory.cc

@@ -2,48 +2,52 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/components/local_search_service/local_search_service_proxy_factory.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy_factory.h"
 
-#include "chromeos/components/local_search_service/local_search_service_proxy.h"
 #include "chromeos/components/local_search_service/local_search_service_sync_factory.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 namespace chromeos {
 namespace local_search_service {
 
 // static
-LocalSearchServiceProxy* LocalSearchServiceProxyFactory::GetForBrowserContext(
+LocalSearchServiceSyncProxy*
+LocalSearchServiceSyncProxyFactory::GetForBrowserContext(
     content::BrowserContext* context) {
-  return static_cast<LocalSearchServiceProxy*>(
-      LocalSearchServiceProxyFactory::GetInstance()
+  return static_cast<LocalSearchServiceSyncProxy*>(
+      LocalSearchServiceSyncProxyFactory::GetInstance()
           ->GetServiceForBrowserContext(context, /*create=*/true));
 }
 
 // static
-LocalSearchServiceProxyFactory* LocalSearchServiceProxyFactory::GetInstance() {
-  static base::NoDestructor<LocalSearchServiceProxyFactory> instance;
+LocalSearchServiceSyncProxyFactory*
+LocalSearchServiceSyncProxyFactory::GetInstance() {
+  static base::NoDestructor<LocalSearchServiceSyncProxyFactory> instance;
   return instance.get();
 }
 
-LocalSearchServiceProxyFactory::LocalSearchServiceProxyFactory()
+LocalSearchServiceSyncProxyFactory::LocalSearchServiceSyncProxyFactory()
     : BrowserContextKeyedServiceFactory(
-          "LocalSearchServiceProxy",
+          "LocalSearchServiceSyncProxy",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(LocalSearchServiceSyncFactory::GetInstance());
 }
 
-LocalSearchServiceProxyFactory::~LocalSearchServiceProxyFactory() = default;
+LocalSearchServiceSyncProxyFactory::~LocalSearchServiceSyncProxyFactory() =
+    default;
 
-content::BrowserContext* LocalSearchServiceProxyFactory::GetBrowserContextToUse(
+content::BrowserContext*
+LocalSearchServiceSyncProxyFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // The service should exist in incognito mode.
   return context;
 }
 
-KeyedService* LocalSearchServiceProxyFactory::BuildServiceInstanceFor(
+KeyedService* LocalSearchServiceSyncProxyFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   DCHECK(context);
-  return new LocalSearchServiceProxy(
+  return new LocalSearchServiceSyncProxy(
       LocalSearchServiceSyncFactory::GetForBrowserContext(context));
 }
 

chromeos/components/local_search_service/local_search_service_proxy_factory.h → chromeos/components/local_search_service/local_search_service_sync_proxy_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_PROXY_FACTORY_H_
-#define CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_PROXY_FACTORY_H_
+#ifndef CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_SYNC_PROXY_FACTORY_H_
+#define CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_SYNC_PROXY_FACTORY_H_
 
 #include "base/no_destructor.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -11,25 +11,25 @@
 namespace chromeos {
 namespace local_search_service {
 
-class LocalSearchServiceProxy;
+class LocalSearchServiceSyncProxy;
 
-class LocalSearchServiceProxyFactory
+class LocalSearchServiceSyncProxyFactory
     : public BrowserContextKeyedServiceFactory {
  public:
-  static LocalSearchServiceProxy* GetForBrowserContext(
+  static LocalSearchServiceSyncProxy* GetForBrowserContext(
       content::BrowserContext* context);
-  static LocalSearchServiceProxyFactory* GetInstance();
+  static LocalSearchServiceSyncProxyFactory* GetInstance();
 
-  LocalSearchServiceProxyFactory(const LocalSearchServiceProxyFactory&) =
-      delete;
-  LocalSearchServiceProxyFactory& operator=(
-      const LocalSearchServiceProxyFactory&) = delete;
+  LocalSearchServiceSyncProxyFactory(
+      const LocalSearchServiceSyncProxyFactory&) = delete;
+  LocalSearchServiceSyncProxyFactory& operator=(
+      const LocalSearchServiceSyncProxyFactory&) = delete;
 
  private:
-  friend class base::NoDestructor<LocalSearchServiceProxyFactory>;
+  friend class base::NoDestructor<LocalSearchServiceSyncProxyFactory>;
 
-  LocalSearchServiceProxyFactory();
-  ~LocalSearchServiceProxyFactory() override;
+  LocalSearchServiceSyncProxyFactory();
+  ~LocalSearchServiceSyncProxyFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   content::BrowserContext* GetBrowserContextToUse(
@@ -41,4 +41,4 @@ class LocalSearchServiceProxyFactory
 }  // namespace local_search_service
 }  // namespace chromeos
 
-#endif  // CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_PROXY_FACTORY_H_
+#endif  // CHROMEOS_COMPONENTS_LOCAL_SEARCH_SERVICE_LOCAL_SEARCH_SERVICE_SYNC_PROXY_FACTORY_H_

chromeos/components/local_search_service/local_search_service_proxy_unittest.cc → chromeos/components/local_search_service/local_search_service_sync_proxy_unittest.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/components/local_search_service/local_search_service_proxy.h"
+#include "chromeos/components/local_search_service/local_search_service_sync_proxy.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "base/test/task_environment.h"
-#include "chromeos/components/local_search_service/index_proxy.h"
+#include "chromeos/components/local_search_service/index_sync_proxy.h"
 #include "chromeos/components/local_search_service/local_search_service_sync.h"
 #include "chromeos/components/local_search_service/mojom/types.mojom.h"
 #include "mojo/public/cpp/bindings/remote.h"
@@ -16,25 +16,25 @@
 namespace chromeos {
 namespace local_search_service {
 
-class LocalSearchServiceProxyTest : public testing::Test {
+class LocalSearchServiceSyncProxyTest : public testing::Test {
  public:
-  LocalSearchServiceProxyTest() {
-    service_proxy_ = std::make_unique<LocalSearchServiceProxy>(&service_);
+  LocalSearchServiceSyncProxyTest() {
+    service_proxy_ = std::make_unique<LocalSearchServiceSyncProxy>(&service_);
     service_proxy_->BindReceiver(service_remote_.BindNewPipeAndPassReceiver());
   }
 
  protected:
-  mojo::Remote<mojom::LocalSearchServiceProxy> service_remote_;
+  mojo::Remote<mojom::LocalSearchServiceSyncProxy> service_remote_;
 
  private:
   base::test::TaskEnvironment task_environment_;
 
   LocalSearchServiceSync service_;
-  std::unique_ptr<LocalSearchServiceProxy> service_proxy_;
+  std::unique_ptr<LocalSearchServiceSyncProxy> service_proxy_;
 };
 
-TEST_F(LocalSearchServiceProxyTest, GetIndex) {
-  mojo::Remote<mojom::IndexProxy> index_remote;
+TEST_F(LocalSearchServiceSyncProxyTest, GetIndex) {
+  mojo::Remote<mojom::IndexSyncProxy> index_remote;
   service_remote_->GetIndex(IndexId::kCrosSettings, Backend::kLinearMap,
                             index_remote.BindNewPipeAndPassReceiver());
   base::RunLoop().RunUntilIdle();

chromeos/components/local_search_service/mojom/local_search_service_proxy.mojom

@@ -18,17 +18,17 @@ enum Backend {
   kInvertedIndex = 1
 };
 
-// LocalSearchServiceProxy creates and owns content-specific IndexProxies.
-// Clients can call |GetIndex| to get an IndexProxy for a given index id.
-interface LocalSearchServiceProxy {
-  // A client can call this function to bind an IndexProxy for |index_id|. If
-  // the Index isn't created when this function is called, LocalSearchService
+// LocalSearchServiceSyncProxy creates and owns content-specific IndexProxies.
+// Clients can call |GetIndex| to get an IndexSyncProxy for a given index id.
+interface LocalSearchServiceSyncProxy {
+  // A client can call this function to bind an IndexSyncProxy for |index_id|.
+  // If the Index isn't created when this function is called, LocalSearchService
   // will create one.
   // Note, there should be one primary client that is the owner of the data and
   // can read/write the data to the Index. The other clients should only use
   // the Index for query search.
   GetIndex(IndexId index_id, Backend backend,
-      pending_receiver<IndexProxy> index_receiver);
+      pending_receiver<IndexSyncProxy> index_receiver);
 };
 
 // A proxy to a local search service Index.
@@ -36,7 +36,7 @@ interface LocalSearchServiceProxy {
 // runs a search function to find matching items for a given query.
 // Each Index can serve multiple clients, but only one client (the primary
 // client) that owns the data should be allowed to modify the Index.
-interface IndexProxy {
+interface IndexSyncProxy {
   // Returns number of data items.
   GetSize() => (uint64 num_items);