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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/scoped_path_override.h" | 9 #include "base/test/scoped_path_override.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 | 102 |
103 // After checking the header, just return a 404. We don't need to actually | 103 // After checking the header, just return a 404. We don't need to actually |
104 // compile and stopping with a 404 is faster. | 104 // compile and stopping with a 404 is faster. |
105 scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse()); | 105 scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse()); |
106 http_response->set_code(net::HTTP_NOT_FOUND); | 106 http_response->set_code(net::HTTP_NOT_FOUND); |
107 http_response->set_content("PEXE ... not found"); | 107 http_response->set_content("PEXE ... not found"); |
108 http_response->set_content_type("application/octet-stream"); | 108 http_response->set_content_type("application/octet-stream"); |
109 return http_response.PassAs<HttpResponse>(); | 109 return http_response.PassAs<HttpResponse>(); |
110 } | 110 } |
111 | 111 |
112 IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, TestHasPnaclHeader) { | 112 // This test is flaky. See http://crbug.com/315328. |
| 113 IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, DISABLED_TestHasPnaclHeader) { |
113 // Load 2 pexes, one same origin and one cross orgin. | 114 // Load 2 pexes, one same origin and one cross orgin. |
114 RunLoadTest("/nacl/pnacl_request_header/pnacl_request_header.html", 1, 1); | 115 RunLoadTest("/nacl/pnacl_request_header/pnacl_request_header.html", 1, 1); |
115 } | 116 } |
OLD | NEW |