Privatize StrongBinding lifetime management

extensions/browser/mojo/stash_backend.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 "extensions/browser/mojo/stash_backend.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/system/watcher.h"
 
 namespace extensions {
 namespace {
 
 // An implementation of StashService that forwards calls to a StashBackend.
 class StashServiceImpl : public StashService {
  public:
-  StashServiceImpl(mojo::InterfaceRequest<StashService> request,
-                   base::WeakPtr<StashBackend> backend);
+  explicit StashServiceImpl(base::WeakPtr<StashBackend> backend);
   ~StashServiceImpl() override;
 
   // StashService overrides.
   void AddToStash(mojo::Array<StashedObjectPtr> stash) override;
   void RetrieveStash(const RetrieveStashCallback& callback) override;
 
  private:
-  mojo::StrongBinding<StashService> binding_;
   base::WeakPtr<StashBackend> backend_;
 
   DISALLOW_COPY_AND_ASSIGN(StashServiceImpl);
 };
 
-StashServiceImpl::StashServiceImpl(mojo::InterfaceRequest<StashService> request,
-                                   base::WeakPtr<StashBackend> backend)
-    : binding_(this, std::move(request)), backend_(backend) {}
+StashServiceImpl::StashServiceImpl(base::WeakPtr<StashBackend> backend)
+    : backend_(backend) {}
 
-StashServiceImpl::~StashServiceImpl() {
-}
+StashServiceImpl::~StashServiceImpl() {}
 
 void StashServiceImpl::AddToStash(
     mojo::Array<StashedObjectPtr> stashed_objects) {
   if (!backend_)
     return;
   backend_->AddToStash(std::move(stashed_objects));
 }
 
 void StashServiceImpl::RetrieveStash(const RetrieveStashCallback& callback) {
   if (!backend_) {
@@ skipping 59 matching lines @@
   has_notified_ = false;
   mojo::Array<StashedObjectPtr> result;
   for (auto& entry : stashed_objects_) {
     result.push_back(entry->Release());
   }
   stashed_objects_.clear();
   return result;
 }
 
 void StashBackend::BindToRequest(mojo::InterfaceRequest<StashService> request) {
-  new StashServiceImpl(std::move(request), weak_factory_.GetWeakPtr());
+  mojo::MakeStrongBinding(
+      base::MakeUnique<StashServiceImpl>(weak_factory_.GetWeakPtr()),
+      std::move(request));
 }
 
 void StashBackend::OnHandleReady() {
   DCHECK(!has_notified_);
   has_notified_ = true;
   for (auto& entry : stashed_objects_) {
     entry->CancelHandleNotifications();
   }
   if (!on_handle_readable_.is_null())
     on_handle_readable_.Run();
@@ skipping 28 matching lines @@
   waiters_.clear();
 }
 
 void StashBackend::StashEntry::OnHandleReady(MojoResult result) {
   if (result != MOJO_RESULT_OK)
     return;
   on_handle_readable_.Run();
 }
 
 }  // namespace extensions