Rework arguments of HistoryService::AddPage()

chrome/browser/safe_browsing/browser_feature_extractor_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 "chrome/browser/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/browser_features.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
-#include "content/public/browser/navigation_controller.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Return;
 using ::testing::StrictMock;
 using content::BrowserThread;
 using content::WebContentsTester;
@@ skipping 129 matching lines @@
 TEST_F(BrowserFeatureExtractorTest, RequestNotInitialized) {
   ClientPhishingRequest request;
   request.set_url("http://www.google.com/");
   // Request is missing the score value.
   SimpleNavigateAndCommit(GURL("http://www.google.com"));
   EXPECT_FALSE(ExtractFeatures(&request));
 }
 
 TEST_F(BrowserFeatureExtractorTest, UrlInHistory) {
   history_service()->AddPage(GURL("http://www.foo.com/bar.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
   history_service()->AddPage(GURL("https://www.foo.com/gaa.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);  // same host HTTPS.
   history_service()->AddPage(GURL("http://www.foo.com/gaa.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);  // same host HTTP.
   history_service()->AddPage(GURL("http://bar.foo.com/gaa.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);  // different host.
   history_service()->AddPage(GURL("http://www.foo.com/bar.html?a=b"),
                              base::Time::Now() - base::TimeDelta::FromHours(23),
-                             NULL, 0, GURL(), content::PAGE_TRANSITION_LINK,
-                             history::RedirectList(), history::SOURCE_BROWSED,
-                             false);
+                             NULL, 0, GURL(), history::RedirectList(),
+                             content::PAGE_TRANSITION_LINK,
+                             history::SOURCE_BROWSED, false);
   history_service()->AddPage(GURL("http://www.foo.com/bar.html"),
                              base::Time::Now() - base::TimeDelta::FromHours(25),
-                             NULL, 0, GURL(), content::PAGE_TRANSITION_TYPED,
-                             history::RedirectList(), history::SOURCE_BROWSED,
-                             false);
+                             NULL, 0, GURL(), history::RedirectList(),
+                             content::PAGE_TRANSITION_TYPED,
+                             history::SOURCE_BROWSED, false);
   history_service()->AddPage(GURL("https://www.foo.com/goo.html"),
                              base::Time::Now() - base::TimeDelta::FromDays(5),
-                             NULL, 0, GURL(), content::PAGE_TRANSITION_TYPED,
-                             history::RedirectList(), history::SOURCE_BROWSED,
-                             false);
+                             NULL, 0, GURL(), history::RedirectList(),
+                             content::PAGE_TRANSITION_TYPED,
+                             history::SOURCE_BROWSED, false);
 
   SimpleNavigateAndCommit(GURL("http://www.foo.com/bar.html"));
 
   ClientPhishingRequest request;
   request.set_url("http://www.foo.com/bar.html");
   request.set_client_score(0.5);
   EXPECT_TRUE(ExtractFeatures(&request));
   std::map<std::string, double> features;
   GetFeatureMap(request, &features);
 
@@ skipping 23 matching lines @@
   EXPECT_DOUBLE_EQ(0.0, features[features::kUrlHistoryTypedCount]);
   EXPECT_DOUBLE_EQ(1.0, features[features::kUrlHistoryLinkCount]);
   EXPECT_DOUBLE_EQ(1.0, features[features::kHttpHostVisitCount]);
   EXPECT_DOUBLE_EQ(0.0, features[features::kHttpsHostVisitCount]);
   EXPECT_DOUBLE_EQ(0.0, features[features::kFirstHttpHostVisitMoreThan24hAgo]);
   EXPECT_FALSE(features.count(features::kFirstHttpsHostVisitMoreThan24hAgo));
 }
 
 TEST_F(BrowserFeatureExtractorTest, MultipleRequestsAtOnce) {
   history_service()->AddPage(GURL("http://www.foo.com/bar.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
   SimpleNavigateAndCommit(GURL("http:/www.foo.com/bar.html"));
   ClientPhishingRequest request;
   request.set_url("http://www.foo.com/bar.html");
   request.set_client_score(0.5);
   StartExtractFeatures(&request);
 
   SimpleNavigateAndCommit(GURL("http://www.foo.com/goo.html"));
   ClientPhishingRequest request2;
   request2.set_url("http://www.foo.com/goo.html");
   request2.set_client_score(1.0);
   StartExtractFeatures(&request2);
 
   MessageLoop::current()->Run();
   EXPECT_TRUE(success_[&request]);
   // Success is false because the second URL is not in the history and we are
   // not able to distinguish between a missing URL in the history and an error.
   EXPECT_FALSE(success_[&request2]);
 }
 
 TEST_F(BrowserFeatureExtractorTest, BrowseFeatures) {
   history_service()->AddPage(GURL("http://www.foo.com/"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
   history_service()->AddPage(GURL("http://www.foo.com/page.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
   history_service()->AddPage(GURL("http://www.bar.com/"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
   history_service()->AddPage(GURL("http://www.bar.com/other_page.html"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
   history_service()->AddPage(GURL("http://www.baz.com/"),
+                             base::Time::Now(),
                              history::SOURCE_BROWSED);
 
   ClientPhishingRequest request;
   request.set_url("http://www.foo.com/");
   request.set_client_score(0.5);
   std::vector<GURL> redirect_chain;
   redirect_chain.push_back(GURL("http://somerandomwebsite.com/"));
   redirect_chain.push_back(GURL("http://www.foo.com/"));
   SetRedirectChain(redirect_chain, true);
   browse_info_->http_status_code = 200;
@@ skipping 219 matching lines @@
   EXPECT_TRUE(features.count(StringPrintf("%s%s",
                                           features::kSafeBrowsingMaliciousUrl,
                                           "http://www.malware.com/")));
   EXPECT_TRUE(features.count(StringPrintf("%s%s",
                                           features::kSafeBrowsingOriginalUrl,
                                           "http://www.good.com/")));
   EXPECT_DOUBLE_EQ(1.0, features[features::kSafeBrowsingIsSubresource]);
   EXPECT_DOUBLE_EQ(2.0, features[features::kSafeBrowsingThreatType]);
 }
 }  // namespace safe_browsing