| 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 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 } | 331 } |
| 332 | 332 |
| 333 base::FilePath::StringType NaClBrowserTestStatic::Variant() { | 333 base::FilePath::StringType NaClBrowserTestStatic::Variant() { |
| 334 return FILE_PATH_LITERAL("static"); | 334 return FILE_PATH_LITERAL("static"); |
| 335 } | 335 } |
| 336 | 336 |
| 337 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { | 337 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { |
| 338 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); | 338 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); |
| 339 return true; | 339 return true; |
| 340 } | 340 } |
| 341 |
| 342 base::FilePath::StringType NaClBrowserTestPnaclNonSfi::Variant() { |
| 343 return FILE_PATH_LITERAL("nonsfi"); |
| 344 } |
| 345 |
| 346 void NaClBrowserTestPnaclNonSfi::SetUpCommandLine( |
| 347 base::CommandLine* command_line) { |
| 348 NaClBrowserTestBase::SetUpCommandLine(command_line); |
| 349 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); |
| 350 } |
| OLD | NEW |