Fix issues when PrerenderContents::Destroy() is called during TabContents destruction.

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2011 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 <deque>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
@@ skipping 71 matching lines @@
         new_render_view_host_(NULL),
         was_hidden_(false),
         was_shown_(false) {
   }
 
   virtual ~TestPrerenderContents() {
     EXPECT_EQ(expected_final_status_, final_status()) <<
         " when testing URL " << prerender_url().path();
     // Prerendering RenderViewHosts should be hidden before the first
     // navigation, so this should be happen for every PrerenderContents for
-    // while a RenderViewHost is created, regardless of whether or not it's
+    // which a RenderViewHost is created, regardless of whether or not it's
     // used.
     if (new_render_view_host_) {
       EXPECT_TRUE(was_hidden_);
     }
 
     // A used PrerenderContents will only be destroyed when we swap out
     // TabContents, at the end of a navigation caused by a call to
     // NavigateToURLImpl().
     if (final_status() == FINAL_STATUS_USED) {
       EXPECT_TRUE(new_render_view_host_);
@@ skipping 409 matching lines @@
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderIframeDelayLoadPlugin) {
   PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html",
                    FINAL_STATUS_USED,
                    1);
   NavigateToDestURL();
 }
 
 // Renders a page that contains a prerender link to a page that contains an
 // iframe with a source that requires http authentication. This should not
 // prerender successfully.
-// Flaky, and crbug.com was down when discovered, so no crbug entry.
+// Flaky:  http://crbug.com/82913.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
-                       DISABLED_PrerenderHttpAuthentication) {
+                       FLAKY_PrerenderHttpAuthentication) {
   PrerenderTestURL("files/prerender/prerender_http_auth_container.html",
                    FINAL_STATUS_AUTH_NEEDED,
                    1);
 }
 
 // Checks that client-issued redirects work with prerendering.
 // This version navigates to the page which issues the redirection, rather
 // than the final destination page.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
                        PrerenderClientRedirectNavigateToFirst) {
@@ skipping 604 matching lines @@
   PrerenderTestURL("files/prerender/prerender_page.html",
                    FINAL_STATUS_WINDOW_OPENER,
                    1);
   OpenDestUrlInNewWindowViaClick();
 }
 
 // TODO(shishir): Add a test for the case when the page having the
 // prerendering link already has an opener set.
 
 }  // namespace prerender