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

Unified Diff: services/service_manager/standalone/context.h

Issue 2620633004: Remove mojo::edk::test::ScopedIPCSupport (Closed)
Patch Set: . 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
Index: services/service_manager/standalone/context.h
diff --git a/services/service_manager/standalone/context.h b/services/service_manager/standalone/context.h
index 17f52b6d54fc685b953c81e399be50b442cffe03..e9d9aa6e4666ae2437c9978bee99f1776f9146d9 100644
--- a/services/service_manager/standalone/context.h
+++ b/services/service_manager/standalone/context.h
@@ -13,7 +13,6 @@
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "base/values.h"
-#include "mojo/edk/embedder/process_delegate.h"
#include "services/service_manager/runner/host/service_process_launcher.h"
#include "services/service_manager/service_manager.h"
#include "services/service_manager/standalone/tracer.h"
@@ -32,7 +31,7 @@ namespace service_manager {
constexpr size_t kThreadPoolMaxThreads = 3;
// The "global" context for the service manager's main process.
-class Context : public mojo::edk::ProcessDelegate {
+class Context {
public:
struct InitParams {
InitParams();
@@ -46,7 +45,7 @@ class Context : public mojo::edk::ProcessDelegate {
};
Context();
- ~Context() override;
+ ~Context();
static void EnsureEmbedderIsInitialized();
@@ -63,8 +62,7 @@ class Context : public mojo::edk::ProcessDelegate {
ServiceManager* service_manager() { return service_manager_.get(); }
private:
- // mojo::edk::ProcessDelegate:
- void OnShutdownComplete() override;
+ void OnShutdownComplete();
// Runs the app specified by |name|.
void Run(const std::string& name);

Powered by Google App Engine
This is Rietveld 408576698