Begin to wean child processes off reliance on a persistent service_manager::Connection to the brows…

services/service_manager/public/cpp/lib/connector_impl.h

Index: services/service_manager/public/cpp/lib/connector_impl.h
diff --git a/services/service_manager/public/cpp/lib/connector_impl.h b/services/service_manager/public/cpp/lib/connector_impl.h
index 7c719a8480961cfa8a52a80dc5be98dc85413e5b..e83ee0f28de1a4c13adb257efa1f715e9791b85c 100644
--- a/services/service_manager/public/cpp/lib/connector_impl.h
+++ b/services/service_manager/public/cpp/lib/connector_impl.h
@@ -5,6 +5,7 @@
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
 
+#include <map>
 #include <memory>
 
 #include "base/callback.h"
@@ -34,6 +35,10 @@ class ConnectorImpl : public Connector {
                      mojo::ScopedMessagePipeHandle interface_pipe) override;
   std::unique_ptr<Connector> Clone() override;
   void BindConnectorRequest(mojom::ConnectorRequest request) override;
+  base::WeakPtr<Connector> GetWeakPtr() override;
+  void OverrideBinderForTesting(const std::string& interface_name,
+                                const TestApi::Binder& binder) override;
+  void ClearBinderOverrides() override;
 
   bool BindConnectorIfNecessary();
 
@@ -42,6 +47,10 @@ class ConnectorImpl : public Connector {
 
   base::ThreadChecker thread_checker_;
 
+  std::map<std::string, TestApi::Binder> local_binder_overrides_;
+
+  base::WeakPtrFactory<Connector> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ConnectorImpl);
 };