Rework arguments of HistoryService::AddPage()

chrome/browser/instant/instant_loader.cc

 // Copyright (c) 2012 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 "chrome/browser/instant/instant_loader.h"
 
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 154 matching lines @@
   CommitFromPointerReleaseIfNecessary();
 }
 
 bool InstantLoader::WebContentsDelegateImpl::OnGoToEntryOffset(int offset) {
   return false;
 }
 
 bool InstantLoader::WebContentsDelegateImpl::ShouldAddNavigationToHistory(
     const history::HistoryAddPageArgs& add_page_args,
     content::NavigationType navigation_type) {
-  loader_->last_navigation_ = add_page_args.Clone();
+  loader_->last_navigation_ = add_page_args;
   return false;
 }
 
 void InstantLoader::WebContentsDelegateImpl::DidFinishLoad(
     int64 frame_id,
     const GURL& validated_url,
     bool is_main_frame,
     content::RenderViewHost* render_view_host) {
   if (is_main_frame) {
     if (!loader_->supports_instant_)
@@ skipping 119 matching lines @@
   SetupPreviewContents();
   // This HTTP header and value are set on loads that originate from instant.
   const char* const kInstantHeader = "X-Purpose: Instant";
   preview_contents_->web_contents()->GetController().LoadURL(GURL(instant_url_),
       content::Referrer(), content::PAGE_TRANSITION_GENERATED, kInstantHeader);
   preview_contents_->web_contents()->WasHidden();
 }
 
 void InstantLoader::Update(const string16& user_text, bool verbatim) {
   // TODO: Support real cursor position.
-  last_navigation_ = NULL;
+  last_navigation_ = history::HistoryAddPageArgs();
   content::RenderViewHost* rvh =
       preview_contents_->web_contents()->GetRenderViewHost();
   rvh->Send(new ChromeViewMsg_SearchBoxChange(rvh->GetRoutingID(), user_text,
                     verbatim, user_text.size(), user_text.size()));
 }
 
 void InstantLoader::SetOmniboxBounds(const gfx::Rect& bounds) {
   content::RenderViewHost* rvh =
       preview_contents_->web_contents()->GetRenderViewHost();
   rvh->Send(new ChromeViewMsg_SearchBoxResize(rvh->GetRoutingID(), bounds));
@@ skipping 99 matching lines @@
                                            content::WebContents* new_contents) {
   DCHECK(old_contents == preview_contents_->web_contents());
   CleanupPreviewContents();
   // We release here without deleting so that the caller still has the
   // responsibility for deleting the TabContents.
   ignore_result(preview_contents_.release());
   preview_contents_.reset(TabContents::FromWebContents(new_contents));
   SetupPreviewContents();
   loader_delegate_->SwappedTabContents(this);
 }