Load additional NSS library files in zygote main if remoting is enabled

content/browser/zygote_main_linux.cc

Index: content/browser/zygote_main_linux.cc
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc
index b56a8a05ef7c4170258f5a27ccac669c332e0c51..70ac817efa329f09ead42da96caccde2f8a32a24 100644
--- a/content/browser/zygote_main_linux.cc
+++ b/content/browser/zygote_main_linux.cc
@@ -605,14 +605,7 @@ static void PreSandboxInit() {
   // reasons so load NSS only if remoting is enabled.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableRemoting)) {
-    // We are going to fork to engage the sandbox and we have not loaded
-    // any security modules so it is safe to disable the fork check in NSS.
-    base::DisableNSSForkCheck();
-
-    // Initialize NSS so that we load the necessary library files
-    // before we enter the sandbox.
-    base::ForceNSSNoDBInit();
-    base::EnsureNSSInit();
+    base::LoadNSSLibraries();
   }
 
   // Ensure access to the Pepper plugins before the sandbox is turned on.