Mojo: more idiomatic C++ bindings

mojo/service_manager/service_manager_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 "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"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/service_manager/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
 
@@ skipping 10 matching lines @@
  public:
   explicit TestServiceImpl(TestContext* context) : context_(context) {
     ++context_->num_impls;
   }
 
   virtual ~TestServiceImpl() {
     --context_->num_impls;
   }
 
   // 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();
   }
 
  private:
   TestContext* context_;
 };
 
 class TestClientImpl : public TestClient {
  public:
   explicit TestClientImpl(TestServicePtr service)
       : service_(service.Pass()),
         quit_after_ack_(false) {
     service_.set_client(this);
   }
 
   virtual ~TestClientImpl() {}
 
   virtual void AckTest() OVERRIDE {
     if (quit_after_ack_)
       base::MessageLoop::current()->Quit();
   }
 
   void Test(std::string test_string) {
-    AllocationScope scope;
     quit_after_ack_ = true;
     service_->Test(test_string);
   }
 
  private:
   TestServicePtr service_;
   bool quit_after_ack_;
   DISALLOW_COPY_AND_ASSIGN(TestClientImpl);
 };
 
@@ skipping 197 matching lines @@
 
   std::string url("test:test3");
   MessagePipe pipe1;
   sm.ConnectToService(GURL(url), pipe1.handle0.Pass());
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());
 }
 
 }  // namespace mojo