| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/pnacl_header_test.h" | 5 #include "chrome/test/nacl/pnacl_header_test.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 127 |
| 128 // After checking the header, just return a 404. We don't need to actually | 128 // After checking the header, just return a 404. We don't need to actually |
| 129 // compile and stopping with a 404 is faster. | 129 // compile and stopping with a 404 is faster. |
| 130 std::unique_ptr<BasicHttpResponse> http_response(new BasicHttpResponse()); | 130 std::unique_ptr<BasicHttpResponse> http_response(new BasicHttpResponse()); |
| 131 http_response->set_code(net::HTTP_NOT_FOUND); | 131 http_response->set_code(net::HTTP_NOT_FOUND); |
| 132 http_response->set_content("PEXE ... not found"); | 132 http_response->set_content("PEXE ... not found"); |
| 133 http_response->set_content_type("application/octet-stream"); | 133 http_response->set_content_type("application/octet-stream"); |
| 134 return std::move(http_response); | 134 return std::move(http_response); |
| 135 } | 135 } |
| 136 | 136 |
| 137 IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, TestHasPnaclHeader) { | 137 // Flaky: http://crbug.com/711289 |
| 138 IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, DISABLED_TestHasPnaclHeader) { |
| 138 // Load 2 pexes, one same origin and one cross orgin. | 139 // Load 2 pexes, one same origin and one cross orgin. |
| 139 RunLoadTest("/nacl/pnacl_request_header/pnacl_request_header.html", 1, 1); | 140 RunLoadTest("/nacl/pnacl_request_header/pnacl_request_header.html", 1, 1); |
| 140 } | 141 } |
| OLD | NEW |