Rework arguments of HistoryService::AddPage()

chrome/browser/history/history_backend_unittest.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 <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 152 matching lines @@
       int page_id,
       content::PageTransition transition,
       base::Time time) {
     history::RedirectList redirects;
     for (int i = 0; sequence[i] != NULL; ++i)
       redirects.push_back(GURL(sequence[i]));
 
     int int_scope = 1;
     void* scope = 0;
     memcpy(&scope, &int_scope, sizeof(int_scope));
-    scoped_refptr<history::HistoryAddPageArgs> request(
-        new history::HistoryAddPageArgs(
-            redirects.back(), time, scope, page_id, GURL(),
-            redirects, transition, history::SOURCE_BROWSED,
-            true));
+    history::HistoryAddPageArgs request(
+        redirects.back(), time, scope, page_id, GURL(),
+        redirects, transition, history::SOURCE_BROWSED,
+        true);
     backend_->AddPage(request);
   }
 
   // Adds CLIENT_REDIRECT page transition.
   // |url1| is the source URL and |url2| is the destination.
   // |did_replace| is true if the transition is non-user initiated and the
   // navigation entry for |url2| has replaced that for |url1|. The possibly
   // updated transition code of the visit records for |url1| and |url2| is
   // returned by filling in |*transition1| and |*transition2|, respectively.
   // |time| is a time of the redirect.
   void  AddClientRedirect(const GURL& url1, const GURL& url2, bool did_replace,
                           base::Time time,
                           int* transition1, int* transition2) {
     void* const dummy_scope = reinterpret_cast<void*>(0x87654321);
     history::RedirectList redirects;
     if (url1.is_valid())
       redirects.push_back(url1);
     if (url2.is_valid())
       redirects.push_back(url2);
-    scoped_refptr<HistoryAddPageArgs> request(
-        new HistoryAddPageArgs(url2, time, dummy_scope, 0, url1,
-            redirects, content::PAGE_TRANSITION_CLIENT_REDIRECT,
-            history::SOURCE_BROWSED, did_replace));
+    HistoryAddPageArgs request(
+        url2, time, dummy_scope, 0, url1,
+        redirects, content::PAGE_TRANSITION_CLIENT_REDIRECT,
+        history::SOURCE_BROWSED, did_replace);
     backend_->AddPage(request);
 
     *transition1 = getTransition(url1);
     *transition2 = getTransition(url2);
   }
 
   int getTransition(const GURL& url) {
     if (!url.is_valid())
       return 0;
     URLRow row;
@@ skipping 407 matching lines @@
 }
 
 // Checks that adding a visit, then calling DeleteAll, and then trying to add
 // data for the visited page works.  This can happen when clearing the history
 // immediately after visiting a page.
 TEST_F(HistoryBackendTest, DeleteAllThenAddData) {
   ASSERT_TRUE(backend_.get());
 
   Time visit_time = Time::Now();
   GURL url("http://www.google.com/");
-  scoped_refptr<HistoryAddPageArgs> request(
-      new HistoryAddPageArgs(url, visit_time, NULL, 0, GURL(),
+  HistoryAddPageArgs request(url, visit_time, NULL, 0, GURL(),
                              history::RedirectList(),
                              content::PAGE_TRANSITION_KEYWORD_GENERATED,
-                             history::SOURCE_BROWSED, false));
+                             history::SOURCE_BROWSED, false);
   backend_->AddPage(request);
 
   // Check that a row was added.
   URLRow outrow;
   EXPECT_TRUE(backend_->db_->GetRowForURL(url, &outrow));
 
   // Check that the visit was added.
   VisitVector all_visits;
   backend_->db_->GetAllVisitsInRange(Time(), Time(), 0, &all_visits);
   ASSERT_EQ(1U, all_visits.size());
@@ skipping 133 matching lines @@
 }
 
 // Tests a handful of assertions for a navigation with a type of
 // KEYWORD_GENERATED.
 TEST_F(HistoryBackendTest, KeywordGenerated) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://google.com");
 
   Time visit_time = Time::Now() - base::TimeDelta::FromDays(1);
-  scoped_refptr<HistoryAddPageArgs> request(
-      new HistoryAddPageArgs(url, visit_time, NULL, 0, GURL(),
+  HistoryAddPageArgs request(url, visit_time, NULL, 0, GURL(),
                              history::RedirectList(),
                              content::PAGE_TRANSITION_KEYWORD_GENERATED,
-                             history::SOURCE_BROWSED, false));
+                             history::SOURCE_BROWSED, false);
   backend_->AddPage(request);
 
   // A row should have been added for the url.
   URLRow row;
   URLID url_id = backend_->db()->GetRowForURL(url, &row);
   ASSERT_NE(0, url_id);
 
   // The typed count should be 1.
   ASSERT_EQ(1, row.typed_count());
 
@@ skipping 203 matching lines @@
   }
   EXPECT_EQ(0x7, sources);
 }
 
 TEST_F(HistoryBackendTest, AddPageArgsSource) {
   ASSERT_TRUE(backend_.get());
 
   GURL url("http://testpageargs.com");
 
   // Assume this page is browsed by user.
-  scoped_refptr<HistoryAddPageArgs> request1(
-      new HistoryAddPageArgs(url, base::Time::Now(), NULL, 0, GURL(),
+  HistoryAddPageArgs request1(url, base::Time::Now(), NULL, 0, GURL(),
                              history::RedirectList(),
                              content::PAGE_TRANSITION_KEYWORD_GENERATED,
-                             history::SOURCE_BROWSED, false));
+                             history::SOURCE_BROWSED, false);
   backend_->AddPage(request1);
   // Assume this page is synced.
-  scoped_refptr<HistoryAddPageArgs> request2(
-      new HistoryAddPageArgs(url, base::Time::Now(), NULL, 0, GURL(),
+  HistoryAddPageArgs request2(url, base::Time::Now(), NULL, 0, GURL(),
                              history::RedirectList(),
                              content::PAGE_TRANSITION_LINK,
-                             history::SOURCE_SYNCED, false));
+                             history::SOURCE_SYNCED, false);
   backend_->AddPage(request2);
   // Assume this page is browsed again.
-  scoped_refptr<HistoryAddPageArgs> request3(
-      new HistoryAddPageArgs(url, base::Time::Now(), NULL, 0, GURL(),
+  HistoryAddPageArgs request3(url, base::Time::Now(), NULL, 0, GURL(),
                              history::RedirectList(),
                              content::PAGE_TRANSITION_TYPED,
-                             history::SOURCE_BROWSED, false));
+                             history::SOURCE_BROWSED, false);
   backend_->AddPage(request3);
 
   // Three visits should be added with proper sources.
   VisitVector visits;
   URLRow row;
   URLID id = backend_->db()->GetRowForURL(url, &row);
   ASSERT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
   ASSERT_EQ(3U, visits.size());
   VisitSourceMap visit_sources;
   ASSERT_TRUE(backend_->GetVisitsSource(visits, &visit_sources));
@@ skipping 1586 matching lines @@
 
     backend_->DeleteURL(url);
     backend_->AddPageNoVisitForBookmark(url, string16());
     backend_->GetURL(url, &row);
     EXPECT_EQ(url, row.url());
     EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title());
     EXPECT_EQ(0, row.visit_count());
 }
 
 }  // namespace history