Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4992)

Unified Diff: chrome/browser/safe_browsing/malware_details_unittest.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/malware_details_unittest.cc
diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc
index a952b1fc7d198dcec4c888d0c43a403c2965ef51..1431f616a41c62547ae414154b806f764b1d2710 100644
--- a/chrome/browser/safe_browsing/malware_details_unittest.cc
+++ b/chrome/browser/safe_browsing/malware_details_unittest.cc
@@ -312,7 +312,7 @@ class MalwareDetailsTest : public ChromeRenderViewHostTestHarness {
redirects->push_back(url);
history_service()->AddPage(
url, base::Time::Now(), reinterpret_cast<history::ContextID>(1), 0,
- GURL(), *redirects, content::PAGE_TRANSITION_TYPED,
+ GURL(), *redirects, ui::PAGE_TRANSITION_TYPED,
history::SOURCE_BROWSED, false);
}
@@ -323,7 +323,7 @@ class MalwareDetailsTest : public ChromeRenderViewHostTestHarness {
TEST_F(MalwareDetailsTest, MalwareSubResource) {
// Start a load.
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -355,7 +355,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResource) {
// different original_url.
TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) {
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -395,7 +395,7 @@ TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) {
// Tests creating a malware report with data from the renderer.
TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -450,7 +450,7 @@ TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
// Verify that https:// urls are dropped.
TEST_F(MalwareDetailsTest, NotPublicUrl) {
controller().LoadURL(GURL(kHttpsURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
scoped_refptr<MalwareDetailsWrap> report = new MalwareDetailsWrap(
@@ -474,7 +474,7 @@ TEST_F(MalwareDetailsTest, NotPublicUrl) {
// resource url
TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) {
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -526,7 +526,7 @@ TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) {
// Tests the interaction with the HTTP cache.
TEST_F(MalwareDetailsTest, HTTPCache) {
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -598,7 +598,7 @@ TEST_F(MalwareDetailsTest, HTTPCache) {
// Tests the interaction with the HTTP cache (where the cache is empty).
TEST_F(MalwareDetailsTest, HTTPCacheNoEntries) {
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -651,7 +651,7 @@ TEST_F(MalwareDetailsTest, HistoryServiceUrls) {
profile()->BlockUntilHistoryProcessesPendingRequests();
controller().LoadURL(GURL(kLandingURL), content::Referrer(),
- content::PAGE_TRANSITION_TYPED, std::string());
+ ui::PAGE_TRANSITION_TYPED, std::string());
UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));

Powered by Google App Engine
This is Rietveld 408576698