OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/test/nacl/nacl_browsertest_util.h" | 5 #include "chrome/test/nacl/nacl_browsertest_util.h" |
6 | 6 |
7 #include <stdlib.h> | 7 #include <stdlib.h> |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 } | 276 } |
277 | 277 |
278 base::FilePath::StringType NaClBrowserTestPnacl::Variant() { | 278 base::FilePath::StringType NaClBrowserTestPnacl::Variant() { |
279 return FILE_PATH_LITERAL("pnacl"); | 279 return FILE_PATH_LITERAL("pnacl"); |
280 } | 280 } |
281 | 281 |
282 bool NaClBrowserTestPnacl::IsAPnaclTest() { | 282 bool NaClBrowserTestPnacl::IsAPnaclTest() { |
283 return true; | 283 return true; |
284 } | 284 } |
285 | 285 |
| 286 void NaClBrowserTestPnaclSubzero::SetUpCommandLine( |
| 287 base::CommandLine* command_line) { |
| 288 NaClBrowserTestPnacl::SetUpCommandLine(command_line); |
| 289 command_line->AppendSwitch(switches::kEnablePNaClSubzero); |
| 290 } |
| 291 |
286 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() { | 292 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() { |
287 return FILE_PATH_LITERAL("libc-free"); | 293 return FILE_PATH_LITERAL("libc-free"); |
288 } | 294 } |
289 | 295 |
290 void NaClBrowserTestNonSfiMode::SetUpCommandLine( | 296 void NaClBrowserTestNonSfiMode::SetUpCommandLine( |
291 base::CommandLine* command_line) { | 297 base::CommandLine* command_line) { |
292 NaClBrowserTestBase::SetUpCommandLine(command_line); | 298 NaClBrowserTestBase::SetUpCommandLine(command_line); |
293 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); | 299 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); |
294 } | 300 } |
295 | 301 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
358 // to point at the isolated the test extension directory. | 364 // to point at the isolated the test extension directory. |
359 // Otherwise, multiple NaCl extensions tests will end up sharing the | 365 // Otherwise, multiple NaCl extensions tests will end up sharing the |
360 // same directory when loading the extension files. | 366 // same directory when loading the extension files. |
361 base::FilePath document_root; | 367 base::FilePath document_root; |
362 ASSERT_TRUE(GetDocumentRoot(&document_root)); | 368 ASSERT_TRUE(GetDocumentRoot(&document_root)); |
363 | 369 |
364 // Document root is relative to source root, and source root may not be CWD. | 370 // Document root is relative to source root, and source root may not be CWD. |
365 command_line->AppendSwitchPath(switches::kLoadExtension, | 371 command_line->AppendSwitchPath(switches::kLoadExtension, |
366 src_root.Append(document_root)); | 372 src_root.Append(document_root)); |
367 } | 373 } |
OLD | NEW |