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

chrome/worker/worker_uitest.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 "base/file_path.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 407 matching lines @@
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
   StopHttpServer();
 }
 
 // Flaky, see http://crbug.com/49381
 TEST_F(WorkerTest, FLAKY_WorkerWebSocketLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "worker-simple.html",
     "shared-worker-simple.html",
+    "worker-handshake-challenge-randomness.html"
   };
 
   FilePath websocket_test_dir;
   websocket_test_dir = websocket_test_dir.AppendASCII("websocket");
   websocket_test_dir = websocket_test_dir.AppendASCII("tests");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kWebSocketPort);
   test_case_dir_ = test_case_dir_.AppendASCII("websocket");
@@ skipping 225 matching lines @@
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
       kTestCompleteCookie, action_max_timeout_ms());
   ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
   ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1));
 }
 
 // TODO(ojan): Started failing with r52393. WebKit merge 63272:63323.
 TEST_F(WorkerTest, FAILS_OpenDatabaseSyncInputs) {
   RunWorkerStorageLayoutTest("open-database-sync-inputs.html");
 }