Mojo: more idiomatic C++ bindings

mojo/shell/dbus_service_loader_linux.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 "mojo/shell/dbus_service_loader_linux.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "dbus/bus.h"
 #include "dbus/file_descriptor.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "mojo/common/channel_init.h"
 #include "mojo/dbus/dbus_external_service.h"
 #include "mojo/embedder/platform_channel_pair.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/external_service.mojom.h"
 #include "mojo/shell/keep_alive.h"
 
 namespace mojo {
 namespace shell {
 
 // Manages the connection to a single externally-running service.
 class DBusServiceLoader::LoadContext {
  public:
@@ skipping 65 matching lines @@
     // TODO(cmasone): handle errors!
     service_dbus_proxy_->CallMethod(
         &call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&LoadContext::ActivateService, base::Unretained(this)));
   }
 
   // Sends a ShellHandle over to the now-connected externally-running service,
   // using the Mojo ExternalService API.
   void ActivateService(dbus::Response* response) {
-    mojo::AllocationScope scope;
     external_service_->Activate(
         mojo::ScopedMessagePipeHandle(
             mojo::MessagePipeHandle(shell_handle_.release().value())));
   }
 
   // Should the ExternalService disappear completely, destroy connection state.
   // NB: This triggers off of the service disappearing from
   // DBus. Perhaps there's a way to watch at the Mojo layer instead,
   // and that would be superior?
   void HandleNameOwnerChanged(const std::string& old_owner,
@@ skipping 54 matching lines @@
   DCHECK(it != url_to_load_context_.end()) << url;
 
   LoadContext* doomed = it->second;
   url_to_load_context_.erase(it);
 
   delete doomed;
 }
 
 }  // namespace shell
 }  // namespace mojo