Rework arguments of HistoryService::AddPage()

chrome/browser/history/history.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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 326 matching lines @@
                   consumer, new history::QuerySegmentUsageRequest(callback),
                   from_time, max_result_count);
 }
 
 void HistoryService::SetOnBackendDestroyTask(const base::Closure& task) {
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetOnBackendDestroyTask,
                     MessageLoop::current(), task);
 }
 
 void HistoryService::AddPage(const GURL& url,
-                             const void* id_scope,
-                             int32 page_id,
-                             const GURL& referrer,
-                             content::PageTransition transition,
-                             const history::RedirectList& redirects,
-                             history::VisitSource visit_source,
-                             bool did_replace_entry) {
-  AddPage(url, Time::Now(), id_scope, page_id, referrer, transition, redirects,
-          visit_source, did_replace_entry);
-}
-
-void HistoryService::AddPage(const GURL& url,
                              Time time,
                              const void* id_scope,
                              int32 page_id,
                              const GURL& referrer,
+                             const history::RedirectList& redirects,
                              content::PageTransition transition,
-                             const history::RedirectList& redirects,
                              history::VisitSource visit_source,
                              bool did_replace_entry) {
-  scoped_refptr<history::HistoryAddPageArgs> request(
-      new history::HistoryAddPageArgs(url, time, id_scope, page_id, referrer,
-                                      redirects, transition, visit_source,
-                                      did_replace_entry));
-  AddPage(*request);
+  AddPage(
+      history::HistoryAddPageArgs(url, time, id_scope, page_id, referrer,
+                                  redirects, transition, visit_source,
+                                  did_replace_entry));
+}
+
+void HistoryService::AddPage(const GURL& url,
+                             base::Time time,
+                             history::VisitSource visit_source) {
+  AddPage(
+      history::HistoryAddPageArgs(url, time, NULL, 0, GURL(),
+                                  history::RedirectList(),
+                                  content::PAGE_TRANSITION_LINK,
+                                  visit_source, false));
 }
 
 void HistoryService::AddPage(const history::HistoryAddPageArgs& add_page_args) {
   DCHECK(thread_) << "History service being called after cleanup";
 
   // Filter out unwanted URLs. We don't add auto-subframe URLs. They are a
   // large part of history (think iframes for ads) and we never display them in
   // history UI. We will still add manual subframes, which are ones the user
   // has clicked on to get.
   if (!CanAddURL(add_page_args.url))
     return;
 
   // Add link & all redirects to visited link list.
   VisitedLinkMaster* visited_links;
   if (profile_ && (visited_links = profile_->GetVisitedLinkMaster())) {
     visited_links->AddURL(add_page_args.url);
 
     if (!add_page_args.redirects.empty()) {
       // We should not be asked to add a page in the middle of a redirect chain.
       DCHECK_EQ(add_page_args.url,
                 add_page_args.redirects[add_page_args.redirects.size() - 1]);
 
       // We need the !redirects.empty() condition above since size_t is unsigned
       // and will wrap around when we subtract one from a 0 size.
       for (size_t i = 0; i < add_page_args.redirects.size() - 1; i++)
         visited_links->AddURL(add_page_args.redirects[i]);
     }
   }
 
-  ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::AddPage,
-                    scoped_refptr<history::HistoryAddPageArgs>(
-                        add_page_args.Clone()));
+  ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::AddPage, add_page_args);
 }
 
 void HistoryService::AddPageNoVisitForBookmark(const GURL& url,
                                                const string16& title) {
   if (!CanAddURL(url))
     return;
 
   ScheduleAndForget(PRIORITY_NORMAL,
                     &HistoryBackend::AddPageNoVisitForBookmark, url, title);
 }
@@ skipping 541 matching lines @@
 void HistoryService::RemoveVisitDatabaseObserver(
     history::VisitDatabaseObserver* observer) {
   visit_database_observers_->RemoveObserver(observer);
 }
 
 void HistoryService::NotifyVisitDBObserversOnAddVisit(
     const history::BriefVisitInfo& info) {
   visit_database_observers_->Notify(
       &history::VisitDatabaseObserver::OnAddVisit, info);
 }