| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_TEST_H_ | 5 #ifndef CHROME_TEST_NACL_NACL_TEST_H_ |
| 6 #define CHROME_TEST_NACL_NACL_TEST_H_ | 6 #define CHROME_TEST_NACL_NACL_TEST_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "chrome/test/layout_test_http_server.h" | 9 #include "chrome/test/base/layout_test_http_server.h" |
| 10 #include "chrome/test/ui/ui_test.h" | 10 #include "chrome/test/ui/ui_test.h" |
| 11 | 11 |
| 12 class FilePath; | 12 class FilePath; |
| 13 | 13 |
| 14 // This class implements integration tests for Native Client. | 14 // This class implements integration tests for Native Client. |
| 15 // For security reasons, Native Client currently loads modules from port 5103 | 15 // For security reasons, Native Client currently loads modules from port 5103 |
| 16 // only, therefore running the test currently requires starting | 16 // only, therefore running the test currently requires starting |
| 17 // a local webserver on this port. | 17 // a local webserver on this port. |
| 18 // This limitation will be removed in the future. | 18 // This limitation will be removed in the future. |
| 19 // Additional functionality used in this test is implemented in html and JS | 19 // Additional functionality used in this test is implemented in html and JS |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 // This test uses an HTML file that lists nexes for different architectures | 54 // This test uses an HTML file that lists nexes for different architectures |
| 55 // in the "nexes" property | 55 // in the "nexes" property |
| 56 bool multiarch_test_; | 56 bool multiarch_test_; |
| 57 | 57 |
| 58 LayoutTestHttpServer http_server_; | 58 LayoutTestHttpServer http_server_; |
| 59 | 59 |
| 60 DISALLOW_COPY_AND_ASSIGN(NaClTest); | 60 DISALLOW_COPY_AND_ASSIGN(NaClTest); |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 #endif // CHROME_TEST_NACL_NACL_TEST_H_ | 63 #endif // CHROME_TEST_NACL_NACL_TEST_H_ |
| OLD | NEW |