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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
323 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() { | 323 base::FilePath::StringType NaClBrowserTestNonSfiMode::Variant() { |
324 return FILE_PATH_LITERAL("libc-free"); | 324 return FILE_PATH_LITERAL("libc-free"); |
325 } | 325 } |
326 | 326 |
327 void NaClBrowserTestNonSfiMode::SetUpCommandLine( | 327 void NaClBrowserTestNonSfiMode::SetUpCommandLine( |
328 base::CommandLine* command_line) { | 328 base::CommandLine* command_line) { |
329 NaClBrowserTestBase::SetUpCommandLine(command_line); | 329 NaClBrowserTestBase::SetUpCommandLine(command_line); |
330 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); | 330 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); |
331 } | 331 } |
332 | 332 |
333 base::FilePath::StringType NaClBrowserTestPnaclNonSfi::Variant() { | |
Mark Seaborn
2014/04/30 21:20:58
Please rebase: similar code was added in Junichi's
hidehiko
2014/05/01 05:20:31
Rebased.
| |
334 return FILE_PATH_LITERAL("nonsfi"); | |
335 } | |
336 | |
337 void NaClBrowserTestPnaclNonSfi::SetUpCommandLine( | |
338 base::CommandLine* command_line) { | |
339 NaClBrowserTestBase::SetUpCommandLine(command_line); | |
340 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); | |
341 } | |
342 | |
333 base::FilePath::StringType NaClBrowserTestStatic::Variant() { | 343 base::FilePath::StringType NaClBrowserTestStatic::Variant() { |
334 return FILE_PATH_LITERAL("static"); | 344 return FILE_PATH_LITERAL("static"); |
335 } | 345 } |
336 | 346 |
337 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { | 347 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { |
338 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); | 348 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); |
339 return true; | 349 return true; |
340 } | 350 } |
OLD | NEW |