Mojo: more idiomatic C++ bindings

mojo/service_manager/service_manager_unittest.cc

Index: mojo/service_manager/service_manager_unittest.cc
diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index 3d21dc80277d28d741e2f6f117726a1c2141cd16..bb103e2adee179bc8911ee1826da0157e6d84985 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/shell/application.h"
 #include "mojo/public/interfaces/shell/shell.mojom.h"
@@ -39,7 +38,7 @@ class TestServiceImpl : public InterfaceImpl<TestService> {
   }
 
   // TestService implementation:
-  virtual void Test(const mojo::String& test_string) OVERRIDE {
+  virtual void Test(mojo::String test_string) OVERRIDE {
     context_->last_test_string = test_string.To<std::string>();
     client()->AckTest();
   }
@@ -64,9 +63,8 @@ class TestClientImpl : public TestClient {
   }
 
   void Test(std::string test_string) {
-    AllocationScope scope;
     quit_after_ack_ = true;
-    service_->Test(test_string);
+    service_->Test(String::From(test_string));
   }
 
  private: