Mojo: more idiomatic C++ bindings

mojo/public/cpp/bindings/tests/request_response_unittest.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/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/test_support/test_utils.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/interfaces/bindings/tests/sample_import.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 class ProviderImpl : public InterfaceImpl<sample::Provider> {
  public:
   virtual void OnConnectionError() MOJO_OVERRIDE {
     delete this;
   }
 
   virtual void EchoString(
-      const String& a,
+      String a,
       const Callback<void(String)>& callback) MOJO_OVERRIDE {
-    AllocationScope scope;
     Callback<void(String)> callback_copy;
     // Make sure operator= is used.
     callback_copy = callback;
-    callback_copy.Run(a);
+    callback_copy.Run(a.Pass());
   }
 
   virtual void EchoStrings(
-      const String& a,
-      const String& b,
+      String a,
+      String b,
       const Callback<void(String, String)>& callback) MOJO_OVERRIDE {
-    AllocationScope scope;
-    callback.Run(a, b);
+    callback.Run(a.Pass(), b.Pass());
   }
 
   virtual void EchoMessagePipeHandle(
       ScopedMessagePipeHandle a,
       const Callback<void(ScopedMessagePipeHandle)>& callback) MOJO_OVERRIDE {
-    AllocationScope scope;
     callback.Run(a.Pass());
   }
 
   virtual void EchoEnum(sample::Enum a,
                         const Callback<void(sample::Enum)>& callback)
       MOJO_OVERRIDE {
     callback.Run(a);
   }
 };
 
 class StringRecorder {
  public:
   StringRecorder(std::string* buf) : buf_(buf) {
   }
-  void Run(const String& a) const {
+  void Run(String a) const {
     *buf_ = a.To<std::string>();
   }
-  void Run(const String& a, const String& b) const {
-    *buf_ = a.To<std::string>() + b.To<std::string>();
+  void Run(String a, String b) const {
+    *buf_ = a.get() + b.get();
   }
  private:
   std::string* buf_;
 };
 
 class EnumRecorder {
  public:
   EnumRecorder(sample::Enum* value) : value_(value) {
   }
   void Run(sample::Enum a) const {
@@ skipping 27 matching lines @@
  private:
   Environment env_;
   RunLoop loop_;
 };
 
 TEST_F(RequestResponseTest, EchoString) {
   sample::ProviderPtr provider;
   BindToProxy(new ProviderImpl(), &provider);
 
   std::string buf;
-  {
-    AllocationScope scope;
-    provider->EchoString("hello", StringRecorder(&buf));
-  }
+  provider->EchoString(String::From("hello"), StringRecorder(&buf));
 
   PumpMessages();
 
   EXPECT_EQ(std::string("hello"), buf);
 }
 
 TEST_F(RequestResponseTest, EchoStrings) {
   sample::ProviderPtr provider;
   BindToProxy(new ProviderImpl(), &provider);
 
   std::string buf;
-  {
-    AllocationScope scope;
-    provider->EchoStrings("hello", " world", StringRecorder(&buf));
-  }
+  provider->EchoStrings(
+      String::From("hello"), String::From(" world"), StringRecorder(&buf));
 
   PumpMessages();
 
   EXPECT_EQ(std::string("hello world"), buf);
 }
 
 TEST_F(RequestResponseTest, EchoMessagePipeHandle) {
   sample::ProviderPtr provider;
   BindToProxy(new ProviderImpl(), &provider);
 
   MessagePipe pipe2;
-  {
-    AllocationScope scope;
-    provider->EchoMessagePipeHandle(pipe2.handle1.Pass(),
-                                    MessagePipeWriter("hello"));
-  }
+  provider->EchoMessagePipeHandle(pipe2.handle1.Pass(),
+                                  MessagePipeWriter("hello"));
 
   PumpMessages();
 
   std::string value;
   ReadTextMessage(pipe2.handle0.get(), &value);
 
   EXPECT_EQ(std::string("hello"), value);
 }
 
 TEST_F(RequestResponseTest, EchoEnum) {
   sample::ProviderPtr provider;
   BindToProxy(new ProviderImpl(), &provider);
 
   sample::Enum value;
-  {
-    AllocationScope scope;
-    provider->EchoEnum(sample::ENUM_VALUE, EnumRecorder(&value));
-  }
+  provider->EchoEnum(sample::ENUM_VALUE, EnumRecorder(&value));
 
   PumpMessages();
 
   EXPECT_EQ(sample::ENUM_VALUE, value);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo