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 0f18cbc60d1124b662b64227551f9da92c0095a2..c3805f31ece10da239c47fe771826643a1f7b9c4 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application.h"
-#include "mojo/public/cpp/application/application.h"
-#include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/service_manager/service_loader.h"
@@ -36,8 +34,8 @@ class TestServiceImpl : public InterfaceImpl<TestService> {
   }
 
   // TestService implementation:
-  virtual void Test(const mojo::String& test_string) OVERRIDE {
-    context_->last_test_string = test_string.To<std::string>();
+  virtual void Test(const String& test_string) OVERRIDE {
+    context_->last_test_string = test_string;
     client()->AckTest();
   }
 
@@ -61,7 +59,6 @@ class TestClientImpl : public TestClient {
   }
 
   void Test(std::string test_string) {
-    AllocationScope scope;
     quit_after_ack_ = true;
     service_->Test(test_string);
   }