Mojo: re-organize public tests

Move sample service test to be with the rest of the bindings tests, and change it to not echo output by default.

R=viettrungluu@chromium.org

Review URL: https://codereview.chromium.org/134823005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244437 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 2 deletions

diff --git a/mojo/common/common_type_converters_unittest.cc b/mojo/common/common_type_converters_unittest.cc
index 96a814e9..90649fd 100644
--- a/mojo/common/common_type_converters_unittest.cc
+++ b/mojo/common/common_type_converters_unittest.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "mojo/common/bindings_support_impl.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/public/tests/simple_bindings_support.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
+namespace common {
 namespace test {
 namespace {
 
@@ -24,7 +25,15 @@ void ExpectEqualsMojoString(const std::string& expected,
 
 class CommonTypeConvertersTest : public testing::Test {
  private:
-  SimpleBindingsSupport bindings_support_;
+  virtual void SetUp() OVERRIDE {
+    BindingsSupport::Set(&bindings_support_);
+  }
+
+  virtual void TearDown() OVERRIDE {
+    BindingsSupport::Set(NULL);
+  }
+
+  BindingsSupportImpl bindings_support_;
 };
 
 TEST_F(CommonTypeConvertersTest, StringPiece) {
@@ -48,4 +57,5 @@ TEST_F(CommonTypeConvertersTest, StringPiece) {
 }
 
 }  // namespace test
+}  // namespace common
 }  // namespace mojo