Non-SFI mode: Enable browser_tests for nacl_helper_nonsfi.

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 275 matching lines @@
 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() {
   return FILE_PATH_LITERAL("libc-free");
 }
 
 void NaClBrowserTestNonSfiMode::SetUpCommandLine(
     base::CommandLine* command_line) {
   NaClBrowserTestBase::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableNaClNonSfiMode);
 }
 
+void NaClBrowserTestTransitionalNonSfi::SetUpCommandLine(
+    base::CommandLine* command_line) {
+  NaClBrowserTestNonSfiMode::SetUpCommandLine(command_line);
+  command_line->AppendSwitch(switches::kUseNaClHelperNonSfi);
+}
+
 base::FilePath::StringType NaClBrowserTestStatic::Variant() {
   return FILE_PATH_LITERAL("static");
 }
 
 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) {
   *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl"));
   return true;
 }
 
 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 NaClBrowserTestPnaclTransitionalNonSfi::SetUpCommandLine(
+    base::CommandLine* command_line) {
+  NaClBrowserTestPnaclNonSfi::SetUpCommandLine(command_line);
+  command_line->AppendSwitch(switches::kUseNaClHelperNonSfi);
+}
+
 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.
@@ skipping 15 matching lines @@
   // 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));
 }