Rework arguments of HistoryService::AddPage()

chrome/browser/history/history.h

 // 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.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_H_
 #define CHROME_BROWSER_HISTORY_HISTORY_H_
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/string16.h"
+#include "base/time.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/common/url_database/template_url_id.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/common/ref_counted_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_transition_types.h"
 #include "sql/init_status.h"
 #include "ui/base/layout.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #endif
 
 class BookmarkService;
 class FilePath;
 class GURL;
 class HistoryURLProvider;
 struct HistoryURLProviderParams;
 class PageUsageData;
 class PageUsageRequest;
 class Profile;
 
 namespace base {
 class Thread;
-class Time;
 }
 
 namespace content {
 struct DownloadPersistentStoreInfo;
 }
 
 namespace history {
 class InMemoryHistoryBackend;
 class InMemoryURLIndex;
 class InMemoryURLIndexTest;
-class HistoryAddPageArgs;
+struct HistoryAddPageArgs;
 class HistoryBackend;
 class HistoryDatabase;
 struct HistoryDetails;
 class HistoryQueryTest;
 class VisitFilter;
 class URLDatabase;
 class VisitDatabaseObserver;
 }  // namespace history
 
 
@@ skipping 91 matching lines @@
   // Return the quick history index.
   history::InMemoryURLIndex* InMemoryIndex() const {
     return in_memory_url_index_.get();
   }
 
   // RefcountedProfileKeyedService:
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // Navigation ----------------------------------------------------------------
 
-  // Adds the given canonical URL to history with the current time as the visit
+  // Adds the given canonical URL to history with the given time as the visit
   // time. Referrer may be the empty string.
   //
   // The supplied render process host is used to scope the given page ID. Page
   // IDs are only unique inside a given render process, so we need that to
   // differentiate them. This pointer should not be dereferenced by the history
   // system.
   //
   // The scope/ids can be NULL if there is no meaningful tracking information
   // that can be performed on the given URL. The 'page_id' should be the ID of
   // the current session history entry in the given process.
   //
   // 'redirects' is an array of redirect URLs leading to this page, with the
   // page itself as the last item (so when there is no redirect, it will have
   // one entry). If there are no redirects, this array may also be empty for
   // the convenience of callers.
   //
   // 'did_replace_entry' is true when the navigation entry for this page has
   // replaced the existing entry. A non-user initiated redirect causes such
   // replacement.
   //
   // All "Add Page" functions will update the visited link database.
   void 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);
-
-  // For adding pages to history with a specific time. This is for testing
-  // purposes. Call the previous one to use the current time.
-  void AddPage(const GURL& url,
                base::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);
 
   // For adding pages to history where no tracking information can be done.
-  void AddPage(const GURL& url, history::VisitSource visit_source) {
-    AddPage(url, NULL, 0, GURL(), content::PAGE_TRANSITION_LINK,
-            history::RedirectList(), visit_source, false);
-  }
+  void AddPage(const GURL& url,
+               base::Time time,
+               history::VisitSource visit_source);
 
   // All AddPage variants end up here.
   void AddPage(const history::HistoryAddPageArgs& add_page_args);
 
   // Adds an entry for the specified url without creating a visit. This should
   // only be used when bookmarking a page, otherwise the row leaks in the
   // history db (it never gets cleaned).
   void AddPageNoVisitForBookmark(const GURL& url, const string16& title);
 
   // Sets the title for the given page. The page should be in history. If it
@@ skipping 854 matching lines @@
   // The index used for quick history lookups.
   scoped_ptr<history::InMemoryURLIndex> in_memory_url_index_;
 
   scoped_refptr<ObserverListThreadSafe<history::VisitDatabaseObserver> >
       visit_database_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryService);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_H_