| Index: extensions/browser/mojo/stash_backend.cc
|
| diff --git a/extensions/browser/mojo/stash_backend.cc b/extensions/browser/mojo/stash_backend.cc
|
| index 7529b351d50b2b8958c60c5b71b58e1ef00fd405..3514d0467d22fc636e4354eee500a7bad9f20447 100644
|
| --- a/extensions/browser/mojo/stash_backend.cc
|
| +++ b/extensions/browser/mojo/stash_backend.cc
|
| @@ -21,8 +21,7 @@ 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.
|
| @@ -30,18 +29,15 @@ class StashServiceImpl : public StashService {
|
| 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) {
|
| @@ -121,7 +117,9 @@ mojo::Array<StashedObjectPtr> StashBackend::RetrieveStash() {
|
| }
|
|
|
| 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() {
|
|
|