Mojo: more idiomatic C++ bindings

mojo/service_manager/service_manager.cc

Index: mojo/service_manager/service_manager.cc
diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
index 3aa955e39383f28246c78fdaa8db849fff064f47..01a87f0980d369fe995484656f3dc31ee2a62e04 100644
--- a/mojo/service_manager/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/service_manager/service_loader.h"
 
 namespace mojo {
@@ -31,16 +30,14 @@ class ServiceManager::ServiceFactory : public InterfaceImpl<ServiceProvider> {
   }
 
   void ConnectToClient(ScopedMessagePipeHandle handle) {
-    if (handle.is_valid()) {
-      AllocationScope scope;
+    if (handle.is_valid())
       client()->ConnectToService(url_.spec(), handle.Pass());
-    }
   }
 
   // ServiceProvider implementation:
   virtual void ConnectToService(const String& url,
                                 ScopedMessagePipeHandle client_pipe) OVERRIDE {
-    manager_->ConnectToService(GURL(url.To<std::string>()), client_pipe.Pass());
+    manager_->ConnectToService(GURL(url), client_pipe.Pass());
   }
 
   const GURL& url() const { return url_; }
@@ -70,7 +67,7 @@ class ServiceManager::TestAPI::TestServiceProviderConnection
   // ServiceProvider:
   virtual void ConnectToService(const String& url,
                                 ScopedMessagePipeHandle client_pipe) OVERRIDE {
-    manager_->ConnectToService(GURL(url.To<std::string>()), client_pipe.Pass());
+    manager_->ConnectToService(GURL(url), client_pipe.Pass());
   }
 
  private: