| Index: services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
|
| diff --git a/services/ui/clipboard/run_all_unittests.cc b/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
|
| similarity index 67%
|
| rename from services/ui/clipboard/run_all_unittests.cc
|
| rename to services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
|
| index fc89617c9b4eaf16bf9bce7542aed72a88724e8f..bce6a6c7a8fafe4987076b476976def6993bec42 100644
|
| --- a/services/ui/clipboard/run_all_unittests.cc
|
| +++ b/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
|
| @@ -1,31 +1,30 @@
|
| -// Copyright 2017 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 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/files/file_path.h"
|
| -#include "base/logging.h"
|
| +#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"
|
| -
|
| -namespace {
|
| -
|
| -const base::FilePath::CharType kCatalogFilename[] =
|
| - FILE_PATH_LITERAL("mus_clipboard_unittests_catalog.json");
|
| -
|
| -} // namespace
|
| +#include "services/service_manager/public/cpp/test/service_test_catalog.h"
|
|
|
| int main(int argc, char** argv) {
|
| base::TestSuite test_suite(argc, argv);
|
|
|
| - catalog::Catalog::LoadDefaultCatalogManifest(
|
| - base::FilePath(kCatalogFilename));
|
| + std::unique_ptr<base::Value> manifest_value =
|
| + base::JSONReader::Read(service_manager::test::kServiceTestCatalog);
|
| + DCHECK(manifest_value);
|
| + catalog::Catalog::SetDefaultCatalogManifest(std::move(manifest_value));
|
|
|
| mojo::edk::Init();
|
| +
|
| base::Thread ipc_thread("IPC thread");
|
| ipc_thread.StartWithOptions(
|
| base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
|
|
|