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 7aa38441fde3977c0396e8b4df22df3c37a3c59f..56800527ac72da630521c0112e3a46f007c908b8 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<Shell> {
   }
 
   void ConnectToClient(ScopedMessagePipeHandle handle) {
-    if (handle.is_valid()) {
-      AllocationScope scope;
-      client()->AcceptConnection(url_.spec(), handle.Pass());
-    }
+    if (handle.is_valid())
+      client()->AcceptConnection(String::From(url_.spec()), handle.Pass());
   }
 
   // Shell implementation:
-  virtual void Connect(const String& url,
+  virtual void Connect(String url,
                        ScopedMessagePipeHandle client_pipe) OVERRIDE {
-    manager_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
+    manager_->Connect(GURL(url), client_pipe.Pass());
   }
 
   const GURL& url() const { return url_; }
@@ -67,9 +64,9 @@ class ServiceManager::TestAPI::TestShellConnection
   }
 
   // Shell:
-  virtual void Connect(const String& url,
+  virtual void Connect(String url,
                        ScopedMessagePipeHandle client_pipe) OVERRIDE {
-    manager_->Connect(GURL(url.To<std::string>()), client_pipe.Pass());
+    manager_->Connect(GURL(url), client_pipe.Pass());
   }
 
  private: