Relanding a backed-out CL:

The navigation entry's state would not be returned for navigation entries of
error pages (such as 404).
This was causing the following problems when navigating back to a 404 page in
test shell:
- a new entry to be created instead of going back to the existing entry
- the navTarget property not to be set on the HistoryItem

That was causing the LayoutTests/http/tests/navigation/error404-goback.html
failure.
It seems safe to return the navigation entry's state for an error page.

BUG=None
TBR=darin
Review URL: http://codereview.chromium.org/43083

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11453 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 5 deletions

diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index bf4fb03..4894a7d 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -492,7 +492,7 @@ bool WebFrameImpl::GetPreviousHistoryState(std::string* history_state) const {
   // is expected to query the history state after a navigation occurs, after
   // the desired history item has become the previous entry.
   RefPtr<HistoryItem> item = webview_impl_->GetPreviousHistoryItem();
-  if (!item || item->lastVisitWasFailure())
+  if (!item)
     return false;
 
   static StatsCounterTimer history_timer("GetHistoryTimer");
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 2424820..8e6050f 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1198,7 +1198,7 @@ MAC : LayoutTests/fast/events/init-events.html = FAIL
 // maybe we just need to update to this order?
 MAC : LayoutTests/fast/events/drag-in-frames.html = FAIL
 
-// These two have a different object type in the dom dump. Plugin-related. 
+// These two have a different object type in the dom dump. Plugin-related.
 // Ignored on Win/Linux because they rely on QT to provide a TIFF decoder.
 MAC : LayoutTests/fast/images/embed-image.html = FAIL
 MAC : LayoutTests/fast/images/object-image.html = FAIL
@@ -1346,9 +1346,6 @@ LINUX MAC : LayoutTests/fast/transforms/transformed-focused-text-input.html = FA
 // TODO(tc): flaky.
 LINUX : LayoutTests/fast/events/5056619.html = PASS FAIL
 
-// Failed with r6844 (dglazkov)
-LayoutTests/http/tests/navigation/error404-goback.html = FAIL
-
 // Passes when run by itself.  Fails on the buildbot.
 // For Windows, see bug 8291.
 LINUX WIN : LayoutTests/fast/css/beforeSelectorOnCodeElement.html = CRASH PASS