Revert "Delete the ViewManager and WindowManager services."

mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc

Index: mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc
diff --git a/mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc b/mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3614965e8610cd9bbb281a88432b73f935972543
--- /dev/null
+++ b/mojo/services/view_manager/cpp/tests/view_manager_test_suite.cc
@@ -0,0 +1,33 @@
+// 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/services/view_manager/cpp/tests/view_manager_test_suite.h"
+
+#include "base/i18n/icu_util.h"
+
+#if defined(USE_X11)
+#include "ui/gfx/x/x11_connection.h"
+#endif
+
+namespace mojo {
+
+ViewManagerTestSuite::ViewManagerTestSuite(int argc, char** argv)
+    : TestSuite(argc, argv) {}
+
+ViewManagerTestSuite::~ViewManagerTestSuite() {}
+
+void ViewManagerTestSuite::Initialize() {
+#if defined(USE_X11)
+  // Each test ends up creating a new thread for the native viewport service.
+  // In other words we'll use X on different threads, so tell it that.
+  gfx::InitializeThreadedX11();
+#endif
+
+  base::TestSuite::Initialize();
+
+  // base::TestSuite and ViewsInit both try to load icu. That's ok for tests.
+  base::i18n::AllowMultipleInitializeCallsForTesting();
+}
+
+}  // namespace mojo