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

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 776 matching lines @@
   if (!dataSource)
     return;
 
   SetAddressBarURL(dataSource->GetRequest().GetMainDocumentURL());
 }
 
 void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) {
   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();
   }
 }
 
 WebWidgetHost* TestWebViewDelegate::GetHostForWidget(WebWidget* webwidget) {
   if (webwidget == shell_->webView())
     return shell_->webViewHost();
   if (webwidget == shell_->popup())
     return shell_->popupHost();
@@ skipping 39 matching lines @@
 
   // Bug 654101: the referrer will be empty on https->http transitions. It
   // would be nice if we could get the real referrer from somewhere.
   entry->SetPageID(page_id_);
   if (ds->HasUnreachableURL()) {
     entry->SetURL(GURL(ds->GetUnreachableURL()));
   } else {
     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_);
 }
 
 void TestWebViewDelegate::UpdateSessionHistory(WebFrame* frame) {
   // If we have a valid page ID at this point, then it corresponds to the page
   // we are navigating away from.  Otherwise, this is the first navigation, so
   // there is no past session history to record.
   if (page_id_ == -1)
@@ skipping 18 matching lines @@
       return L"main frame \"" + name + L"\"";
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }