Merge 53027 - Call rand_s() in a worker process before entering the sandbox....

chrome/worker/worker_main.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/hi_res_timer_manager.h"
 #include "app/system_monitor.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/common/child_process.h"
@@ skipping 18 matching lines @@
   HighResolutionTimerManager hi_res_timer_manager;
 
   ChildProcess worker_process;
   worker_process.set_main_thread(new WorkerThread());
 #if defined(OS_WIN)
   sandbox::TargetServices* target_services =
       parameters.sandbox_info_.TargetServices();
   if (!target_services)
     return false;
 
+  // Cause advapi32 to load before the sandbox is turned on.
+  unsigned int dummy_rand;
+  rand_s(&dummy_rand);
+
   target_services->LowerToken();
 #endif
 
   const CommandLine& parsed_command_line = parameters.command_line_;
   if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) {
     ChildProcess::WaitForDebugger(L"Worker");
   }
 
   // Load the accelerator table from the browser executable and tell the
   // message loop to use it when translating messages.
   MessageLoop::current()->Run();
 
   return 0;
 }