Take 2 at fixing relativeanchor-{basic,frames}.html....

webkit/tools/test_shell/test_webview_delegate.cc

Index: webkit/tools/test_shell/test_webview_delegate.cc
===================================================================
--- webkit/tools/test_shell/test_webview_delegate.cc	(revision 16304)
+++ webkit/tools/test_shell/test_webview_delegate.cc	(working copy)
@@ -794,17 +794,6 @@
   if (frame == top_loading_frame_) {
     top_loading_frame_ = NULL;
 
-    // It is important to update the content state for the current navigation
-    // entry in case we are done with the test and need to dump the back/
-    // forward list.
-    std::string state;
-    if (shell_->webView()->GetMainFrame()->GetCurrentHistoryState(&state)) {
-      TestNavigationEntry* entry =
-          shell_->navigation_controller()->GetLastCommittedEntry();
-      if (entry)
-        entry->SetContentState(state);
-    }
-
     if (shell_->layout_test_mode())
       shell_->layout_test_controller()->LocationChangeDone();
   }
@@ -864,6 +853,10 @@
     entry->SetURL(GURL(request.GetURL()));
   }
 
+  std::string state;
+  if (frame->GetCurrentHistoryState(&state))
+    entry->SetContentState(state);
+
   shell_->navigation_controller()->DidNavigateToEntry(entry.release());
 
   last_page_id_updated_ = std::max(last_page_id_updated_, page_id_);