Package test_ws in content_browsertests
This allows content_browsertests run test_ws in process with
single process mash and run it out of process for mash.
Changes:
- Make test_ws a packaged service in content_browsertests
so that it could used in process for single process mash
as well as out of process for mash;
- Remove the code that launches standalone test_ws for mash;
- Update TestWindowService so that it could be createe with
content's ContextFactory/Private and CpuInterfaceProvider
for single process mash and also works for mash;
- Update WmTestHelper to support running in the same process
of window service;
Bug: 874089
Change-Id: Iece79fb9b96b48b8affb450cb44486c0b7ed00f0
Reviewed-on: https://chromium-review.googlesource.com/1228792
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Tom Sepez <[email protected]>
Commit-Queue: Xiyuan Xia <[email protected]>
Cr-Commit-Position: refs/heads/master@{#592478}diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h
index 733af42..6859024 100644
--- a/content/shell/browser/shell_content_browser_client.h
+++ b/content/shell/browser/shell_content_browser_client.h
@@ -49,6 +49,9 @@
base::StringPiece name) override;
void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id) override;
+ void AdjustUtilityServiceProcessCommandLine(
+ const service_manager::Identity& identity,
+ base::CommandLine* command_line) override;
std::string GetAcceptLangs(BrowserContext* context) override;
void ResourceDispatcherHostCreated() override;
std::string GetDefaultDownloadName() override;
