Reenable PnaclHeaderTest, set up observer before navigating.

chrome/test/nacl/pnacl_header_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/nacl/pnacl_header_test.h"
 
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 30 matching lines @@
 }
 
 void PnaclHeaderTest::TearDown() {
   ASSERT_TRUE(embedded_test_server()->ShutdownAndWaitUntilComplete());
   InProcessBrowserTest::TearDown();
 }
 
 void PnaclHeaderTest::RunLoadTest(const std::string& url,
                                   int expected_noncors,
                                   int expected_cors) {
-  ui_test_utils::NavigateToURL(browser(), embedded_test_server()->GetURL(url));
-  // Wait until the NMF and pexe are also loaded, not just the HTML.
-  // Do this by waiting till the LoadTestMessageHandler responds.
   LoadTestMessageHandler handler;
   JavascriptTestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
       &handler);
+  ui_test_utils::NavigateToURL(browser(), embedded_test_server()->GetURL(url));
+  // Wait until the NMF and pexe are also loaded, not just the HTML.
+  // Do this by waiting till the LoadTestMessageHandler responds.
   EXPECT_TRUE(observer.Run()) << handler.error_message();
   EXPECT_TRUE(handler.test_passed()) << "Test failed.";
   EXPECT_EQ(expected_noncors, noncors_loads_);
   EXPECT_EQ(expected_cors, cors_loads_);
 }
 
 scoped_ptr<HttpResponse> PnaclHeaderTest::WatchForPexeFetch(
     const HttpRequest& request) {
   // Avoid favicon.ico warning by giving it a dummy icon.
   if (request.relative_url.find("favicon.ico") != std::string::npos) {
@@ skipping 30 matching lines @@
 
   // After checking the header, just return a 404. We don't need to actually
   // compile and stopping with a 404 is faster.
   scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse());
   http_response->set_code(net::HTTP_NOT_FOUND);
   http_response->set_content("PEXE ... not found");
   http_response->set_content_type("application/octet-stream");
   return http_response.PassAs<HttpResponse>();
 }
 
-// Disabled: http://crbug.com/315328.
-IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, DISABLED_TestHasPnaclHeader) {
+IN_PROC_BROWSER_TEST_F(PnaclHeaderTest, TestHasPnaclHeader) {
   // Load 2 pexes, one same origin and one cross orgin.
   RunLoadTest("/nacl/pnacl_request_header/pnacl_request_header.html", 1, 1);
 }