| 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 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 5 #ifndef CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
| 6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 6 #define CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
| 7 | 7 |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 base::FilePath::StringType Variant() override; | 116 base::FilePath::StringType Variant() override; |
| 117 }; | 117 }; |
| 118 | 118 |
| 119 class NaClBrowserTestPnacl : public NaClBrowserTestBase { | 119 class NaClBrowserTestPnacl : public NaClBrowserTestBase { |
| 120 public: | 120 public: |
| 121 base::FilePath::StringType Variant() override; | 121 base::FilePath::StringType Variant() override; |
| 122 | 122 |
| 123 bool IsAPnaclTest() override; | 123 bool IsAPnaclTest() override; |
| 124 }; | 124 }; |
| 125 | 125 |
| 126 // TODO(jvoung): We can remove this and test the Subzero translator |
| 127 // with NaClBrowserTestPnacl once Subzero is automatically chosen |
| 128 // (not behind a flag). |
| 129 class NaClBrowserTestPnaclSubzero : public NaClBrowserTestPnacl { |
| 130 public: |
| 131 void SetUpCommandLine(base::CommandLine* command_line) override; |
| 132 }; |
| 133 |
| 126 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase { | 134 class NaClBrowserTestPnaclNonSfi : public NaClBrowserTestBase { |
| 127 public: | 135 public: |
| 128 void SetUpCommandLine(base::CommandLine* command_line) override; | 136 void SetUpCommandLine(base::CommandLine* command_line) override; |
| 129 base::FilePath::StringType Variant() override; | 137 base::FilePath::StringType Variant() override; |
| 130 }; | 138 }; |
| 131 | 139 |
| 132 // "Transitional" here means that this uses nacl_helper_nonsfi which has | 140 // "Transitional" here means that this uses nacl_helper_nonsfi which has |
| 133 // nacl_helper feature for Non-SFI mode, but statically linked to newlib | 141 // nacl_helper feature for Non-SFI mode, but statically linked to newlib |
| 134 // instead of using host glibc. It is still under development. | 142 // instead of using host glibc. It is still under development. |
| 135 // TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when | 143 // TODO(hidehiko): Switch NonSfi tests to use nacl_helper_nonsfi, when |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 | 239 |
| 232 #define NACL_BROWSER_TEST_F(suite, name, body) \ | 240 #define NACL_BROWSER_TEST_F(suite, name, body) \ |
| 233 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ | 241 IN_PROC_BROWSER_TEST_F(suite##Newlib, name) \ |
| 234 body \ | 242 body \ |
| 235 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ | 243 IN_PROC_BROWSER_TEST_F(suite##GLibc, MAYBE_GLIBC(name)) \ |
| 236 body \ | 244 body \ |
| 237 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ | 245 IN_PROC_BROWSER_TEST_F(suite##Pnacl, MAYBE_PNACL(name)) \ |
| 238 body | 246 body |
| 239 | 247 |
| 240 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ | 248 #endif // CHROME_TEST_NACL_NACL_BROWSERTEST_UTIL_H_ |
| OLD | NEW |