Privatize StrongBinding lifetime management

content/shell/utility/shell_content_utility_client.cc

 // Copyright 2015 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/shell/utility/shell_content_utility_client.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/process/process.h"
 #include "content/public/test/test_mojo_app.h"
 #include "content/public/test/test_mojo_service.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
 namespace content {
 
 namespace {
 
 class TestMojoServiceImpl : public mojom::TestMojoService {
  public:
   static void Create(mojo::InterfaceRequest<mojom::TestMojoService> request) {
-    new TestMojoServiceImpl(std::move(request));
+    mojo::MakeStrongBinding(base::WrapUnique(new TestMojoServiceImpl),
+                            std::move(request));
   }
 
   // mojom::TestMojoService implementation:
   void DoSomething(const DoSomethingCallback& callback) override {
     callback.Run();
   }
 
   void DoTerminateProcess(const DoTerminateProcessCallback& callback) override {
     base::Process::Current().Terminate(0, false);
   }
 
   void CreateFolder(const CreateFolderCallback& callback) override {
     // Note: This is used to check if the sandbox is disabled or not since
     //       creating a folder is forbidden when it is enabled.
     callback.Run(base::ScopedTempDir().CreateUniqueTempDir());
   }
 
   void GetRequestorName(const GetRequestorNameCallback& callback) override {
     NOTREACHED();
   }
 
  private:
-  explicit TestMojoServiceImpl(
-      mojo::InterfaceRequest<mojom::TestMojoService> request)
-      : binding_(this, std::move(request)) {}
-
-  mojo::StrongBinding<mojom::TestMojoService> binding_;
+  explicit TestMojoServiceImpl() {}
 
   DISALLOW_COPY_AND_ASSIGN(TestMojoServiceImpl);
 };
 
 std::unique_ptr<shell::Service> CreateTestApp(
     const base::Closure& quit_closure) {
   return std::unique_ptr<shell::Service>(new TestMojoApp);
 }
 
 }  // namespace
 
 ShellContentUtilityClient::~ShellContentUtilityClient() {
 }
 
 void ShellContentUtilityClient::RegisterMojoApplications(
     StaticMojoApplicationMap* apps) {
   MojoApplicationInfo app_info;
   app_info.application_factory = base::Bind(&CreateTestApp);
   apps->insert(std::make_pair(kTestMojoAppUrl, app_info));
 }
 
 void ShellContentUtilityClient::ExposeInterfacesToBrowser(
     shell::InterfaceRegistry* registry) {
   registry->AddInterface(base::Bind(&TestMojoServiceImpl::Create));
 }
 
 }  // namespace content