Rework arguments of HistoryService::AddPage()

chrome/browser/instant/instant_controller.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_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
+#include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_tab_helper.h"
 #include "chrome/browser/instant/instant_controller_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 319 matching lines @@
 
   return preview;
 }
 
 TabContents* InstantController::ReleasePreviewContents(InstantCommitType type) {
   TabContents* preview = loader_->ReleasePreviewContents(type, last_full_text_);
 
   // If the preview page has navigated since the last Update(), we need to add
   // the navigation to history ourselves. Else, the page will navigate after
   // commit, and it will be added to history in the usual manner.
-  scoped_refptr<history::HistoryAddPageArgs> last_navigation =
+  const history::HistoryAddPageArgs& last_navigation =
       loader_->last_navigation();
-  if (last_navigation != NULL) {
+  if (!last_navigation.url.is_empty()) {
     content::NavigationEntry* entry =
         preview->web_contents()->GetController().GetActiveEntry();
-    DCHECK_EQ(last_navigation->url, entry->GetURL());
+    DCHECK_EQ(last_navigation.url, entry->GetURL());
 
     // Add the page to history.
     preview->history_tab_helper()->UpdateHistoryForNavigation(last_navigation);
 
     // Update the page title.
     preview->history_tab_helper()->UpdateHistoryPageTitle(*entry);
 
     // Update the favicon.
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         preview->profile(), Profile::EXPLICIT_ACCESS);
     if (favicon_service && entry->GetFavicon().valid &&
         entry->GetFavicon().image.IsEmpty()) {
       favicon_service->SetFavicons(entry->GetURL(), entry->GetFavicon().url,
           history::FAVICON, entry->GetFavicon().image);
     }
   }
 
   // Add a fake history entry with a non-Instant search URL, so that search
   // terms extraction (for autocomplete history matches) works.
   HistoryService* history = HistoryServiceFactory::GetForProfile(
       preview->profile(), Profile::EXPLICIT_ACCESS);
   if (history) {
-    history->AddPage(url_for_history_, NULL, 0, GURL(), last_transition_type_,
-                     history::RedirectList(), history::SOURCE_BROWSED, false);
+    history->AddPage(url_for_history_, base::Time::Now(), NULL, 0, GURL(),
+                     history::RedirectList(), last_transition_type_,
+                     history::SOURCE_BROWSED, false);
   }
 
   AddPreviewUsageForHistogram(mode_, PREVIEW_COMMITTED);
 
   // We may have gotten here from CommitInstant(), which means the loader may
   // still be on the stack. So, schedule a destruction for later.
   MessageLoop::current()->DeleteSoon(FROM_HERE, loader_.release());
 
   // This call is here to hide the preview and reset view state. It won't
   // actually delete |loader_| because it was just released to DeleteSoon().
@@ skipping 395 matching lines @@
       DCHECK(url_obj.is_valid());
       *instant_url = url_obj.spec();
     }
   }
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }