Use public Service Manager Connector API in Blink

third_party/WebKit/Source/platform/exported/Platform.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/platform/Platform.h"
 
+#include <memory>
+
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "platform/Histogram.h"
 #include "platform/MemoryCoordinator.h"
 #include "platform/PartitionAllocMemoryDumpProvider.h"
 #include "platform/fonts/FontCacheMemoryDumpProvider.h"
 #include "platform/heap/BlinkGCMemoryDumpProvider.h"
 #include "platform/heap/GCTaskRunner.h"
 #include "platform/instrumentation/tracing/MemoryCacheDumpProvider.h"
-#include "public/platform/Connector.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/WebPrerenderingSupport.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
+namespace {
+
+class DefaultConnector {
+ public:
+  DefaultConnector() {
+    service_manager::mojom::ConnectorRequest request;
+    m_connector = service_manager::Connector::Create(&request);
+  }
+
+  service_manager::Connector* get() { return m_connector.get(); }
+
+ private:
+  std::unique_ptr<service_manager::Connector> m_connector;
+};
+
+}  // namespace
+
 static Platform* s_platform = nullptr;
 
 static GCTaskRunner* s_gcTaskRunner = nullptr;
 
 static void maxObservedSizeFunction(size_t sizeInMB) {
   const size_t supportedMaxSizeInMB = 4 * 1024;
   if (sizeInMB >= supportedMaxSizeInMB)
     sizeInMB = supportedMaxSizeInMB - 1;
 
   // Send a UseCounter only when we see the highest memory usage
@@ skipping 54 matching lines @@
 }
 
 Platform* Platform::current() {
   return s_platform;
 }
 
 WebThread* Platform::mainThread() const {
   return m_mainThread;
 }
 
-Connector* Platform::connector() {
-  return Connector::getEmptyConnector();
+service_manager::Connector* Platform::connector() {
+  DEFINE_STATIC_LOCAL(DefaultConnector, connector, ());
+  return connector.get();
 }
 
 InterfaceProvider* Platform::interfaceProvider() {
   return InterfaceProvider::getEmptyInterfaceProvider();
 }
 
 }  // namespace blink