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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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
===================================================================
--- chrome/browser/safe_browsing/malware_details_unittest.cc (revision 105162)
+++ chrome/browser/safe_browsing/malware_details_unittest.cc (working copy)
@@ -299,7 +299,8 @@
// to history backend.
redirects->push_back(url);
history_service()->AddPage(
- url, static_cast<void*>(this), 0, GURL(), PageTransition::TYPED,
+ url, static_cast<void*>(this), 0, GURL(),
+ content::PAGE_TRANSITION_TYPED,
*redirects, history::SOURCE_BROWSED, false);
}
@@ -311,8 +312,8 @@
// Tests creating a simple malware report.
TEST_F(MalwareDetailsTest, MalwareSubResource) {
// Start a load.
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -343,8 +344,8 @@
// Tests creating a simple malware report where the subresource has a
// different original_url.
TEST_F(MalwareDetailsTest, MalwareSubResourceWithOriginalUrl) {
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -383,8 +384,8 @@
// Tests creating a malware report with data from the renderer.
TEST_F(MalwareDetailsTest, MalwareDOMDetails) {
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -440,7 +441,7 @@
// Verify that https:// urls are dropped.
TEST_F(MalwareDetailsTest, NotPublicUrl) {
- controller().LoadURL(GURL(kHttpsURL), GURL(), PageTransition::TYPED,
+ controller().LoadURL(GURL(kHttpsURL), GURL(), content::PAGE_TRANSITION_TYPED,
std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -464,8 +465,8 @@
// Tests creating a malware report where there are redirect urls to an unsafe
// resource url
TEST_F(MalwareDetailsTest, MalwareWithRedirectUrl) {
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -516,8 +517,8 @@
// Tests the interaction with the HTTP cache.
TEST_F(MalwareDetailsTest, HTTPCache) {
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -589,8 +590,8 @@
// Tests the interaction with the HTTP cache (where the cache is empty).
TEST_F(MalwareDetailsTest, HTTPCacheNoEntries) {
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));
@@ -643,8 +644,8 @@
// Wait for history service operation finished.
profile()->BlockUntilHistoryProcessesPendingRequests();
- controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
- std::string());
+ controller().LoadURL(GURL(kLandingURL), GURL(),
+ content::PAGE_TRANSITION_TYPED, std::string());
SafeBrowsingService::UnsafeResource resource;
InitResource(&resource, true, GURL(kMalwareURL));

Powered by Google App Engine
This is Rietveld 408576698