| Index: content/shell/browser/shell_content_browser_client.cc
|
| diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
|
| index dd9840a749f27644ba5ca6d597f758f2f6d6ea51..4f7651b7e19f17b7a8b09c134d66f29e22756645 100644
|
| --- a/content/shell/browser/shell_content_browser_client.cc
|
| +++ b/content/shell/browser/shell_content_browser_client.cc
|
| @@ -54,11 +54,6 @@
|
| #include "content/public/common/content_descriptors.h"
|
| #endif
|
|
|
| -#if defined(OS_WIN)
|
| -#include "content/common/sandbox_win.h"
|
| -#include "sandbox/win/src/sandbox.h"
|
| -#endif
|
| -
|
| #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
|
| #include "media/mojo/services/mojo_media_application_factory.h"
|
| #endif
|
| @@ -365,23 +360,6 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
|
| }
|
| #endif // defined(OS_ANDROID)
|
|
|
| -#if defined(OS_WIN)
|
| -bool ShellContentBrowserClient::PreSpawnRenderer(
|
| - sandbox::TargetPolicy* policy) {
|
| - // Add sideloaded font files for testing. See also DIR_WINDOWS_FONTS
|
| - // addition in |StartSandboxedProcess|.
|
| - std::vector<std::string> font_files = switches::GetSideloadFontFiles();
|
| - for (std::vector<std::string>::const_iterator i(font_files.begin());
|
| - i != font_files.end();
|
| - ++i) {
|
| - policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES,
|
| - sandbox::TargetPolicy::FILES_ALLOW_READONLY,
|
| - base::UTF8ToWide(*i).c_str());
|
| - }
|
| - return true;
|
| -}
|
| -#endif // OS_WIN
|
| -
|
| ShellBrowserContext* ShellContentBrowserClient::browser_context() {
|
| return shell_browser_main_parts_->browser_context();
|
| }
|
|
|