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

content/child/push_messaging/push_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/push_messaging/push_provider.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
 #include "content/child/child_thread_impl.h"
 #include "content/child/service_worker/web_service_worker_registration_impl.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/push_subscription_options.h"
-#include "services/service_manager/public/cpp/interface_provider.h"
+#include "content/public/common/service_names.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscription.h"
 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushSubscriptionOptions.h"
 
 namespace content {
 namespace {
 
 int CurrentWorkerId() {
   return WorkerThread::GetCurrentId();
 }
@@ skipping 70 matching lines @@
 
   PushProvider* provider = new PushProvider(main_thread_task_runner);
   if (CurrentWorkerId())
     WorkerThread::AddObserver(provider);
   return provider;
 }
 
 // static
 void PushProvider::GetInterface(mojom::PushMessagingRequest request) {
   if (ChildThreadImpl::current()) {
-    ChildThreadImpl::current()->GetRemoteInterfaces()->GetInterface(
-        std::move(request));
+    ChildThreadImpl::current()->GetConnector()->BindInterface(
+        mojom::kBrowserServiceName, std::move(request));
   }
 }
 
 void PushProvider::WillStopCurrentWorkerThread() {
   delete this;
 }
 
 void PushProvider::subscribe(
     blink::WebServiceWorkerRegistration* service_worker_registration,
     const blink::WebPushSubscriptionOptions& options,
@@ skipping 151 matching lines @@
       error_message =
           "Push subscriptions that don't enable userVisibleOnly are not "
           "supported.";
     }
     callbacks->onError(blink::WebPushError(
         error_type, blink::WebString::fromUTF8(error_message)));
   }
 }
 
 }  // namespace content