Add support for running NaCl-Chrome integration tests on Win64

chrome/test/nacl/nacl_test.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 "chrome/test/nacl/nacl_test.h"
 
 #include "base/file_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
+#include "native_client/src/trusted/platform_qualify/nacl_os_qualify.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 
 namespace {
 
 const int kNaClTestTimeout = 20000;
 const char kTestCompleteCookie[] = "status";
 const char kTestCompleteSuccess[] = "OK";
 
 const FilePath::CharType kBaseUrl[] =
@@ skipping 31 matching lines @@
     FILE_PATH_LITERAL("server_test.html");
 
 }  // anonymous namespace
 
 NaClTest::NaClTest()
     : UITest() {
   launch_arguments_.AppendSwitch(switches::kInternalNaCl);
 #if defined(OS_MACOSX)
   launch_arguments_.AppendSwitch(switches::kNoSandbox);
 #endif
+
+#if defined(OS_WIN)
+  if (NaClOsIs64BitWindows())
+    launch_arguments_.AppendSwitch(switches::kNoSandbox);
+#endif
 }
 
 NaClTest::~NaClTest() {}
 
 FilePath NaClTest::GetTestRootDir() {
   FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   path = path.AppendASCII("native_client");
   path = path.AppendASCII("tests");
   return path;
 }
 
 FilePath NaClTest::GetTestBinariesDir() {
   FilePath path = GetTestRootDir();
   path = path.AppendASCII("prebuilt");
-  path = path.AppendASCII("x86");
+  bool use_x64_nexes = false;
+#if defined(OS_WIN)
+  if (NaClOsIs64BitWindows())
+    use_x64_nexes = true;
+#endif
+
+  if (use_x64_nexes)
+    path = path.AppendASCII("x64");
+  else
+    path = path.AppendASCII("x86");
   return path;
 }
 
 // static
 GURL NaClTest::GetTestUrl(const FilePath& filename) {
   FilePath path(kBaseUrl);
   path = path.Append(filename);
   return GURL(path.value());
 }
 
@@ skipping 146 matching lines @@
 void NaClTest::TearDown() {
   StopHttpServer();
   UITest::TearDown();
 }
 
 int NaClTest::NaClTestTimeout() {
   return std::max(kNaClTestTimeout, action_max_timeout_ms());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_ServerTest) {
 #else
 TEST_F(NaClTest, ServerTest) {
 #endif
   FilePath test_file(kServerHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_SrpcHelloWorld) {
 #else
 TEST_F(NaClTest, SrpcHelloWorld) {
 #endif
   FilePath test_file(kSrpcHwHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_SrpcBasicTest) {
 #else
 TEST_F(NaClTest, SrpcBasicTest) {
 #endif
   FilePath test_file(kSrpcBasicHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_SrpcSockAddrTest) {
 #else
 TEST_F(NaClTest, SrpcSockAddrTest) {
 #endif
   FilePath test_file(kSrpcSockAddrHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_SrpcShmTest) {
 #else
 TEST_F(NaClTest, SrpcShmTest) {
 #endif
   FilePath test_file(kSrpcShmHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_SrpcPluginTest) {
 #else
 TEST_F(NaClTest, SrpcPluginTest) {
 #endif
   FilePath test_file(kSrpcPluginHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
 #if defined(OS_MACOSX)
+// http://code.google.com/p/nativeclient/issues/detail?id=342
 TEST_F(NaClTest, FLAKY_SrpcNrdXferTest) {
 #else
 TEST_F(NaClTest, SrpcNrdXferTest) {
 #endif
   FilePath test_file(kSrpcNrdXferHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }