Set file tokens for NaCl main nexe if available to enable validation caching.

chrome/test/nacl/nacl_browsertest_util.cc

 // Copyright (c) 2012 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_browsertest_util.h"
 
 #include <stdlib.h>
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/path_service.h"
@@ skipping 151 matching lines @@
 // pexes are artifacts of the build.  To keep things tidy, all test data is kept
 // in a subdirectory.  Several variants of a test may be run, for example when
 // linked against newlib and when linked against glibc.  These variants are kept
 // in different subdirectories.  For example, the build directory will look
 // something like this on Linux:
 // out/
 //     Release/
 //             nacl_test_data/
 //                            newlib/
 //                            glibc/
+//                            pnacl/
 static bool GetNaClVariantRoot(const base::FilePath::StringType& variant,
                                base::FilePath* document_root) {
   if (!ui_test_utils::GetRelativeBuildDirectory(document_root))
     return false;
   *document_root = document_root->Append(FILE_PATH_LITERAL("nacl_test_data"));
   *document_root = document_root->Append(variant);
   return true;
 }
 
 static void AddPnaclParm(const base::FilePath::StringType& url,
@@ skipping 72 matching lines @@
   base::FilePath::StringType test_file_with_both = test_file_with_pnacl;
   if (IsPnaclDisabled()) {
     AddPnaclDisabledParm(test_file_with_pnacl, &test_file_with_both);
   }
   bool ok = RunJavascriptTest(TestURL(test_file_with_both), &handler);
   ASSERT_TRUE(ok) << handler.error_message();
   ASSERT_TRUE(handler.test_passed()) << "Test failed.";
 }
 
 void NaClBrowserTestBase::RunNaClIntegrationTest(
-    const base::FilePath::StringType& url_fragment) {
+    const base::FilePath::StringType& url_fragment, bool full_url) {
   NaClIntegrationMessageHandler handler;
   base::FilePath::StringType url_fragment_with_pnacl = url_fragment;
   if (IsAPnaclTest()) {
     AddPnaclParm(url_fragment, &url_fragment_with_pnacl);
   }
   base::FilePath::StringType url_fragment_with_both = url_fragment_with_pnacl;
   if (IsPnaclDisabled()) {
     AddPnaclDisabledParm(url_fragment_with_pnacl, &url_fragment_with_both);
   }
-  bool ok = RunJavascriptTest(TestURL(url_fragment_with_both), &handler);
+  bool ok = RunJavascriptTest(full_url
+                              ? GURL(url_fragment_with_both)
+                              : TestURL(url_fragment_with_both),
+                              &handler);
   ASSERT_TRUE(ok) << handler.error_message();
   ASSERT_TRUE(handler.test_passed()) << "Test failed.";
 }
 
 bool NaClBrowserTestBase::StartTestServer() {
   // Launch the web server.
   base::FilePath document_root;
   if (!GetDocumentRoot(&document_root))
     return false;
   test_server_.reset(new net::SpawnedTestServer(
@@ skipping 57 matching lines @@
 
 base::FilePath::StringType NaClBrowserTestPnaclNonSfi::Variant() {
   return FILE_PATH_LITERAL("nonsfi");
 }
 
 void NaClBrowserTestPnaclNonSfi::SetUpCommandLine(
     base::CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 }
+
+void NaClBrowserTestNewlibExtension::SetUpCommandLine(
+    CommandLine* command_line) {
+  NaClBrowserTestBase::SetUpCommandLine(command_line);
+  base::FilePath src_root;
+  ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &src_root));
+
+  // Extension-based tests should specialize the GetDocumentRoot() / Variant()
+  // to point at the isolated the test extension directory.
+  // Otherwise, multiple NaCl extensions tests will end up sharing the
+  // same directory when loading the extension files.
+  base::FilePath document_root;
+  ASSERT_TRUE(GetDocumentRoot(&document_root));
+
+  // Document root is relative to source root, and source root may not be CWD.
+  command_line->AppendSwitchPath(switches::kLoadExtension,
+                                 src_root.Append(document_root));
+}