Roll V8 to version 3.4.2. Second attempt.

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 @@
                           url, referrer),
         number_of_loads_(0),
         expected_number_of_loads_(number_of_loads),
         expected_final_status_(expected_final_status),
         new_render_view_host_(NULL),
         was_hidden_(false),
         was_shown_(false) {
   }
 
   virtual ~TestPrerenderContents() {
-    EXPECT_EQ(expected_final_status_, final_status()) <<
+    EXPECT_EQ(FinalStatusCanonicalize(expected_final_status_),
+              FinalStatusCanonicalize(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
     // 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
@@ skipping 67 matching lines @@
         // Once hidden, a prerendered RenderViewHost should only be shown after
         // being removed from the PrerenderContents for display.
         EXPECT_FALSE(render_view_host());
         was_shown_ = true;
       }
       return;
     }
     PrerenderContents::Observe(type, source, details);
   }
 
+  static FinalStatus FinalStatusCanonicalize(FinalStatus final) {
+    if (final == FINAL_STATUS_JS_OUT_OF_MEMORY) {
+      return FINAL_STATUS_MEMORY_LIMIT_EXCEEDED;
+    }
+    return final;
+  }
+
   int number_of_loads_;
   int expected_number_of_loads_;
   FinalStatus expected_final_status_;
 
   // The RenderViewHost created for the prerender, if any.
   RenderViewHost* new_render_view_host_;
   // Set to true when the prerendering RenderWidget is hidden.
   bool was_hidden_;
   // Set to true when the prerendering RenderWidget is shown, after having been
   // hidden.
@@ skipping 1118 matching lines @@
 
 // Checks that a local storage write will not cause prerender to fail.
 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderLocalStorageWrite) {
   PrerenderTestURL("files/prerender/prerender_localstorage_write.html",
                    FINAL_STATUS_USED,
                    1);
   NavigateToDestURL();
 }
 
 }  // namespace prerender