Add chromium-side support for history.{push,replace}State.

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2010 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 "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 859 matching lines @@
 void TestWebViewDelegate::didFinishLoad(WebFrame* frame) {
   TRACE_EVENT_END("frame.load", this, frame->url().spec());
   if (shell_->ShouldDumpFrameLoadCallbacks()) {
     printf("%S - didFinishLoadForFrame\n",
            GetFrameDescription(frame).c_str());
   }
   UpdateAddressBar(frame->view());
   LocationChangeDone(frame);
 }
 
-void TestWebViewDelegate::didChangeLocationWithinPage(
+void TestWebViewDelegate::didNavigateWithinPage(
     WebFrame* frame, bool is_new_navigation) {
   frame->dataSource()->setExtraData(pending_extra_data_.release());
 
+  UpdateForCommittedLoad(frame, is_new_navigation);
+}
+
+void TestWebViewDelegate::didChangeLocationWithinPage(WebFrame* frame) {
   if (shell_->ShouldDumpFrameLoadCallbacks()) {
     printf("%S - didChangeLocationWithinPageForFrame\n",
            GetFrameDescription(frame).c_str());
   }
-
-  UpdateForCommittedLoad(frame, is_new_navigation);
 }
 
 void TestWebViewDelegate::assignIdentifierToRequest(
     WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
   if (shell_->ShouldDumpResourceLoadCallbacks()) {
     resource_identifier_map_[identifier] =
         DescriptionSuitableForTestResult(request.url().spec());
   }
 }
 
@@ skipping 180 matching lines @@
 
 void TestWebViewDelegate::UpdateAddressBar(WebView* webView) {
   WebFrame* main_frame = webView->mainFrame();
 
   WebDataSource* data_source = main_frame->dataSource();
   if (!data_source)
     data_source = main_frame->provisionalDataSource();
   if (!data_source)
     return;
 
-  // TODO(abarth): This is wrong!
-  SetAddressBarURL(data_source->request().firstPartyForCookies());
+  SetAddressBarURL(data_source->request().url());
 }
 
 void TestWebViewDelegate::LocationChangeDone(WebFrame* frame) {
   if (frame == top_loading_frame_) {
     top_loading_frame_ = NULL;
 
     if (shell_->layout_test_mode())
       shell_->layout_test_controller()->LocationChangeDone();
   }
 }
@@ skipping 47 matching lines @@
   } else {
     entry->SetURL(request.url());
   }
 
   const WebHistoryItem& history_item = frame->currentHistoryItem();
   if (!history_item.isNull())
     entry->SetContentState(webkit_glue::HistoryItemToString(history_item));
 
   shell_->navigation_controller()->DidNavigateToEntry(entry.release());
   shell_->UpdateNavigationControls();
+  UpdateAddressBar(frame->view());
 
   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)
     return;
@@ skipping 28 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }