Generate better catalog C++ sources

services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc

Index: services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
diff --git a/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc b/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
index bce6a6c7a8fafe4987076b476976def6993bec42..8d02f3fe4471b440d6bb24c8b122d549cb6d6221 100644
--- a/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
+++ b/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
@@ -2,14 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <memory>
-
-#include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "base/threading/thread.h"
-#include "base/values.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "services/catalog/catalog.h"
@@ -18,10 +14,8 @@
 int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);
 
-  std::unique_ptr<base::Value> manifest_value =
-      base::JSONReader::Read(service_manager::test::kServiceTestCatalog);
-  DCHECK(manifest_value);
-  catalog::Catalog::SetDefaultCatalogManifest(std::move(manifest_value));
+  catalog::Catalog::SetDefaultCatalogManifest(
+      service_manager::test::CreateTestCatalog());
 
   mojo::edk::Init();