[NoStatePrefetch] Re-enable non-html tests

chrome/browser/prerender/prerender_nostate_prefetch_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 385 matching lines @@
           FINAL_STATUS_RENDERER_CRASHED);
   std::unique_ptr<PrerenderHandle> prerender_handle(
       GetPrerenderManager()->AddPrerenderFromExternalRequest(
           GURL(content::kChromeUICrashURL), content::Referrer(),
           storage_namespace, gfx::Rect(kSize)));
   ASSERT_EQ(prerender_handle->contents(), test_prerender->contents());
   test_prerender->WaitForStop();
 }
 
 // Checks that the prefetch of png correctly loads the png.
-// TODO(pasko): Add support for prefetching non-HTML documents and re-enable the
-// test.
-IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, DISABLED_Png) {
+IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, Png) {
   RequestCounter counter;
   CountRequestFor(kPrefetchPng, &counter);
   PrefetchFromFile(kPrefetchPng, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
   counter.WaitForCount(1);
 }
 
 // Checks that the prefetch of png correctly loads the jpeg.
-// TODO(pasko): Add support for prefetching non-HTML documents and re-enable the
-// test.
-IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, DISABLED_Jpeg) {
+IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest, Jpeg) {
   RequestCounter counter;
   CountRequestFor(kPrefetchJpeg, &counter);
   PrefetchFromFile(kPrefetchJpeg, FINAL_STATUS_NOSTATE_PREFETCH_FINISHED);
   counter.WaitForCount(1);
 }
 
 // Checks that nothing is prefetched from malware sites.
 // TODO(mattcary): disabled as prefetch process teardown is racey with prerender
 // contents destruction, can fix when prefetch prerenderers are destroyed
 // deterministically.
 IN_PROC_BROWSER_TEST_F(NoStatePrefetchBrowserTest,
                        DISABLED_PrerenderSafeBrowsingTopLevel) {
   GURL url = src_server()->GetURL(MakeAbsolute(kPrefetchPage));
   GetFakeSafeBrowsingDatabaseManager()->SetThreatTypeForUrl(
       url, safe_browsing::SB_THREAT_TYPE_URL_MALWARE);
   // Prefetch resources are blocked, but the prerender is not killed in any
   // special way.
   // TODO(mattcary): since the prerender will count itself as loaded even if the
   // fetch of the main resource fails, the test doesn't actually confirm what we
   // want it to confirm. This may be fixed by planned changes to the prerender
   // lifecycle.
   std::unique_ptr<TestPrerender> prerender =
       PrefetchFromFile(kPrefetchPage, FINAL_STATUS_SAFE_BROWSING);
 }
 
 }  // namespace prerender