Cancel prerenders that spawn post requests.

chrome/browser/prerender/prerender_browsertest.cc

Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 6ee343948504a3dc829f5bc691924677612a3cfc..1653c740698475b48d4ff655e7b87e736b0af1c3 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -790,6 +790,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
   NavigateToURL("files/prerender/prerender_fragment_location_hash.html");
 }
 
+<<<<<<< HEAD

[cbentzel, 2011/04/29 20:00:30]

bad merge

[dominich, 2011/04/29 21:13:52]

Done.

 // Checks that ftp scheme is not supported for prerender.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderBadSchemeFtp) {
   PrerenderTestURL(GURL("ftp://ftp.example.com"),
@@ -945,6 +946,19 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                    1);
 }
 
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrGet) {
+  PrerenderTestURL("files/prerender/prerender_xhr_get.html",
+                   FINAL_STATUS_USED,
+                   1);
+  NavigateToDestURL();
+}
+
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderXhrPost) {
+  PrerenderTestURL("files/prerender/prerender_xhr_post.html",
+                   FINAL_STATUS_NOT_GET,
+                   1);
+}
+
 // TODO(cbentzel): Add tests for file, chrome, and about schemes, which fail
 //                 at webkit resource load time.