mash: Makes mash and service:ui not establish outgoing connections

services/ui/ime/ime_server_impl.cc

Index: services/ui/ime/ime_server_impl.cc
diff --git a/services/ui/ime/ime_server_impl.cc b/services/ui/ime/ime_server_impl.cc
index a5a10d37c80965690f171e765590ba0f12382343..19c89b5b492b7988990864d4fb9cc2627c6e432d 100644
--- a/services/ui/ime/ime_server_impl.cc
+++ b/services/ui/ime/ime_server_impl.cc
@@ -5,7 +5,6 @@
 #include "services/ui/ime/ime_server_impl.h"
 
 #include "base/memory/ptr_util.h"
-#include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/ime/ime_registrar_impl.h"
 
@@ -17,18 +16,9 @@ IMEServerImpl::~IMEServerImpl() {}
 
 void IMEServerImpl::Init(service_manager::Connector* connector,
                          bool is_test_config) {
-  connector_ = connector;
-  connector_->BindInterface(catalog::mojom::kServiceName, &catalog_);
-  // TODO(moshayedi): crbug.com/664264. The catalog service should provide
-  // different set of entries for test and non-test. Once that is implemented,
-  // we won't need this check here.
-  if (is_test_config) {
-    connector_->Connect("test_ime_driver");
-  } else {
-    catalog_->GetEntriesProvidingCapability(
-        "ime:ime_driver", base::Bind(&IMEServerImpl::OnGotCatalogEntries,
-                                     base::Unretained(this)));
-  }
+  if (is_test_config)
+    connector->Connect("test_ime_driver");
+  // For non test configs we assume a client registers with us.
 }
 
 void IMEServerImpl::AddBinding(mojom::IMEServerRequest request) {
@@ -42,8 +32,6 @@ void IMEServerImpl::OnDriverChanged(mojom::IMEDriverPtr driver) {
   if (driver_)
     return;
 
-  // TODO(moshayedi): crbug.com/664267. Make sure this is the driver we
-  // requested at OnGotCatalogEntries().
   driver_ = std::move(driver);
 
   while (!pending_requests_.empty()) {
@@ -64,13 +52,4 @@ void IMEServerImpl::StartSession(mojom::StartSessionDetailsPtr details) {
   }
 }
 
-void IMEServerImpl::OnGotCatalogEntries(
-    std::vector<catalog::mojom::EntryPtr> entries) {
-  // TODO(moshayedi): crbug.com/662157. Decide what to do when number of
-  // available IME drivers isn't exactly one.
-  if (entries.size() == 0)
-    return;
-  connector_->Connect((*entries.begin())->name);
-}
-
 }  // namespace ui