Commit 7fd75093 authored by Alex Gough's avatar Alex Gough Committed by Commit Bot

Supply ProfileImporter sandbox type from service_sandbox_type.h

This should not change behaviour.

TEST=Manual browser_tests.exe --gtest_filter=EdgeImporter*

Bug: 1065087
Change-Id: Ia67cd29625ff34575682da57a45ab68bd3104d3d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2196838
Auto-Submit: Alex Gough <ajgo@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#768531}
parent 9ea80719
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/importer/external_process_importer_host.h" #include "chrome/browser/importer/external_process_importer_host.h"
#include "chrome/browser/importer/in_process_importer_bridge.h" #include "chrome/browser/importer/in_process_importer_bridge.h"
#include "chrome/browser/service_sandbox_type.h"
#include "chrome/common/importer/firefox_importer_utils.h" #include "chrome/common/importer/firefox_importer_utils.h"
#include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/grit/generated_resources.h" #include "chrome/grit/generated_resources.h"
...@@ -41,7 +42,6 @@ void ExternalProcessImporterClient::Start() { ...@@ -41,7 +42,6 @@ void ExternalProcessImporterClient::Start() {
profile_import_.BindNewPipeAndPassReceiver(), profile_import_.BindNewPipeAndPassReceiver(),
content::ServiceProcessHost::Options() content::ServiceProcessHost::Options()
.WithDisplayName(IDS_UTILITY_PROCESS_PROFILE_IMPORTER_NAME) .WithDisplayName(IDS_UTILITY_PROCESS_PROFILE_IMPORTER_NAME)
.WithSandboxType(service_manager::SandboxType::kNoSandbox)
.Pass()); .Pass());
profile_import_.set_disconnect_handler( profile_import_.set_disconnect_handler(
base::BindOnce(&ExternalProcessImporterClient::OnProcessCrashed, this)); base::BindOnce(&ExternalProcessImporterClient::OnProcessCrashed, this));
......
...@@ -27,4 +27,16 @@ content::GetServiceSandboxType<chrome::mojom::UtilWin>() { ...@@ -27,4 +27,16 @@ content::GetServiceSandboxType<chrome::mojom::UtilWin>() {
} }
#endif #endif
// chrome::mojom::ProfileImport
namespace chrome {
namespace mojom {
class ProfileImport;
}
} // namespace chrome
template <>
inline content::SandboxType
content::GetServiceSandboxType<chrome::mojom::ProfileImport>() {
return content::SandboxType::kNoSandbox;
}
#endif // CHROME_BROWSER_SERVICE_SANDBOX_TYPE_H_ #endif // CHROME_BROWSER_SERVICE_SANDBOX_TYPE_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment