Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Unified Diff: services/service_manager/runner/host/service_process_launcher_unittest.cc

Issue 2617713002: [WIP] Add DCHECK for mojo::edk::Init().
Patch Set: test Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/service_manager/public/cpp/test/run_all_service_tests.cc ('k') | services/ui/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/service_manager/runner/host/service_process_launcher_unittest.cc
diff --git a/services/service_manager/runner/host/service_process_launcher_unittest.cc b/services/service_manager/runner/host/service_process_launcher_unittest.cc
index 5fb3827a3221dd3c0e192599fdbe8c77f7b30269..42b6a3976c04ebcd174a16ed11112fdccc6d5fa8 100644
--- a/services/service_manager/runner/host/service_process_launcher_unittest.cc
+++ b/services/service_manager/runner/host/service_process_launcher_unittest.cc
@@ -15,9 +15,6 @@
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/run_loop.h"
-#include "base/threading/thread.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/embedder/process_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace service_manager {
@@ -40,16 +37,6 @@ void ProcessReadyCallbackAdapater(const base::Closure& callback,
callback.Run();
}
-class ProcessDelegate : public mojo::edk::ProcessDelegate {
- public:
- ProcessDelegate() {}
- ~ProcessDelegate() override {}
-
- private:
- void OnShutdownComplete() override {}
- DISALLOW_COPY_AND_ASSIGN(ProcessDelegate);
-};
-
class ServiceProcessLauncherDelegateImpl
: public ServiceProcessLauncher::Delegate {
public:
@@ -89,14 +76,6 @@ TEST(ServieProcessLauncherTest, MAYBE_StartJoin) {
new base::SequencedWorkerPool(3, "blocking_pool",
base::TaskPriority::USER_VISIBLE));
- base::Thread io_thread("io_thread");
- base::Thread::Options options;
- options.message_loop_type = base::MessageLoop::TYPE_IO;
- io_thread.StartWithOptions(options);
-
- ProcessDelegate delegate;
- mojo::edk::InitIPCSupport(&delegate, io_thread.task_runner());
-
base::FilePath test_service_path =
base::FilePath(kPackagesPath).AppendASCII(kTestServiceName)
.AppendASCII(kTestServiceName) .AddExtension(kServiceExtension);
@@ -114,7 +93,6 @@ TEST(ServieProcessLauncherTest, MAYBE_StartJoin) {
launcher.Join();
blocking_pool->Shutdown();
- mojo::edk::ShutdownIPCSupport();
EXPECT_EQ(1u, service_process_launcher_delegate.get_and_clear_adjust_count());
}
« no previous file with comments | « services/service_manager/public/cpp/test/run_all_service_tests.cc ('k') | services/ui/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698