diff options
| author | davidben <davidben@chromium.org> | 2015-10-02 10:06:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-02 17:07:01 +0000 |
| commit | ee55ed44da66cc54b3d5ab295485b7bbf3c0716a (patch) | |
| tree | 0765e9d6061e89d0fc2da019f9f27834abc6db93 /chromecast | |
| parent | d533be96e34f2ede2a231caaae74129a06a4dbc2 (diff) | |
| download | chromium_src-ee55ed44da66cc54b3d5ab295485b7bbf3c0716a.zip chromium_src-ee55ed44da66cc54b3d5ab295485b7bbf3c0716a.tar.gz chromium_src-ee55ed44da66cc54b3d5ab295485b7bbf3c0716a.tar.bz2 | |
Fold away now dead NSS code.
Anything not built on iOS can now assume USE_OPENSSL is set. Most notably, the
libc urandom override is now gone.
BUG=519504
Review URL: https://codereview.chromium.org/1364023003
Cr-Commit-Position: refs/heads/master@{#352061}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/renderer/cast_content_renderer_client.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chromecast/renderer/cast_content_renderer_client.cc b/chromecast/renderer/cast_content_renderer_client.cc index 63d19cb..d8a93c5 100644 --- a/chromecast/renderer/cast_content_renderer_client.cc +++ b/chromecast/renderer/cast_content_renderer_client.cc @@ -23,7 +23,6 @@ #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_observer.h" -#include "crypto/nss_util.h" #include "third_party/WebKit/public/platform/WebColor.h" #include "third_party/WebKit/public/web/WebSettings.h" #include "third_party/WebKit/public/web/WebView.h" @@ -111,15 +110,6 @@ void CastContentRendererClient::AddRendererNativeBindings( void CastContentRendererClient::RenderThreadStarted() { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); -#if !defined(USE_OPENSSL) - // Note: Copied from chrome_render_process_observer.cc to fix b/8676652. - // - // On platforms where the system NSS shared libraries are used, - // initialize NSS now because it won't be able to load the .so's - // after entering the sandbox. - if (!command_line->HasSwitch(switches::kSingleProcess)) - crypto::InitNSSSafely(); -#endif #if defined(ARCH_CPU_ARM_FAMILY) && !defined(OS_ANDROID) PlatformPollFreemem(); |