Revert "Delete the ViewManager and WindowManager services."

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

Index: mojo/services/view_manager/cpp/tests/run_all_unittests.cc
diff --git a/shell/shell_test_main.cc b/mojo/services/view_manager/cpp/tests/run_all_unittests.cc
similarity index 51%
copy from shell/shell_test_main.cc
copy to mojo/services/view_manager/cpp/tests/run_all_unittests.cc
index 92cdb62ca669549c1ec20aac256f4792e8d5d91a..a3d5d1edeb6cdee155c73e6021e55e2b18686361 100644
--- a/shell/shell_test_main.cc
+++ b/mojo/services/view_manager/cpp/tests/run_all_unittests.cc
@@ -2,22 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/at_exit.h"
 #include "base/bind.h"
-#include "base/command_line.h"
-#include "base/logging.h"
 #include "base/test/launcher/unit_test_launcher.h"
-#include "base/test/test_suite.h"
-#include "shell/child_switches.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "mojo/services/view_manager/cpp/tests/view_manager_test_suite.h"
 
 int main(int argc, char** argv) {
-  base::CommandLine::Init(argc, argv);
+  mojo::ViewManagerTestSuite test_suite(argc, argv);
 
-  CHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kChildConnectionId));
-
-  base::TestSuite test_suite(argc, argv);
   return base::LaunchUnitTests(
       argc, argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));