diff options
Diffstat (limited to 'chrome/browser/prerender')
8 files changed, 41 insertions, 27 deletions
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index 85f2c9e..4f9ff17 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -684,7 +684,7 @@ void PrerenderContents::DidGetRedirectForResourceRequest( // it's a redirect on the top-level resource, the name needs to be remembered // for future matching, and if it redirects to an https resource, it needs to // be canceled. If a subresource is redirected, nothing changes. - if (details.resource_type != ResourceType::MAIN_FRAME) + if (details.resource_type != content::RESOURCE_TYPE_MAIN_FRAME) return; CheckURL(details.new_url); } diff --git a/chrome/browser/prerender/prerender_pending_swap_throttle.cc b/chrome/browser/prerender/prerender_pending_swap_throttle.cc index 5c519e3..5148ace 100644 --- a/chrome/browser/prerender/prerender_pending_swap_throttle.cc +++ b/chrome/browser/prerender/prerender_pending_swap_throttle.cc @@ -30,7 +30,7 @@ void PrerenderPendingSwapThrottle::WillStartRequest(bool* defer) { content::ResourceRequestInfo::ForRequest(request_); // We only care about main frame loads. - if (info->GetResourceType() != ResourceType::MAIN_FRAME) + if (info->GetResourceType() != content::RESOURCE_TYPE_MAIN_FRAME) return; int render_process_id = info->GetChildID(); diff --git a/chrome/browser/prerender/prerender_resource_throttle.cc b/chrome/browser/prerender/prerender_resource_throttle.cc index d578f4f..70e1aee 100644 --- a/chrome/browser/prerender/prerender_resource_throttle.cc +++ b/chrome/browser/prerender/prerender_resource_throttle.cc @@ -78,7 +78,7 @@ void PrerenderResourceThrottle::Cancel() { void PrerenderResourceThrottle::WillStartRequestOnUI( const base::WeakPtr<PrerenderResourceThrottle>& throttle, const std::string& method, - ResourceType::Type resource_type, + ResourceType resource_type, int render_process_id, int render_frame_id, const GURL& url) { @@ -96,7 +96,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI( ReportUnsupportedPrerenderScheme(url); cancel = true; #if defined(OS_ANDROID) - } else if (resource_type == ResourceType::FAVICON) { + } else if (resource_type == content::RESOURCE_TYPE_FAVICON) { // Delay icon fetching until the contents are getting swapped in // to conserve network usage in mobile devices. prerender_contents->AddResourceThrottle(throttle); @@ -115,7 +115,7 @@ void PrerenderResourceThrottle::WillStartRequestOnUI( void PrerenderResourceThrottle::WillRedirectRequestOnUI( const base::WeakPtr<PrerenderResourceThrottle>& throttle, const std::string& follow_only_when_prerender_shown_header, - ResourceType::Type resource_type, + ResourceType resource_type, bool async, int render_process_id, int render_frame_id, @@ -130,7 +130,7 @@ void PrerenderResourceThrottle::WillRedirectRequestOnUI( ReportUnsupportedPrerenderScheme(new_url); cancel = true; } else if (follow_only_when_prerender_shown_header == "1" && - resource_type != ResourceType::MAIN_FRAME) { + resource_type != content::RESOURCE_TYPE_MAIN_FRAME) { // Only defer redirects with the Follow-Only-When-Prerender-Shown // header. Do not defer redirects on main frame loads. if (!async) { diff --git a/chrome/browser/prerender/prerender_resource_throttle.h b/chrome/browser/prerender/prerender_resource_throttle.h index 3d2a43c..c2535b9 100644 --- a/chrome/browser/prerender/prerender_resource_throttle.h +++ b/chrome/browser/prerender/prerender_resource_throttle.h @@ -49,7 +49,7 @@ class PrerenderResourceThrottle static void WillStartRequestOnUI( const base::WeakPtr<PrerenderResourceThrottle>& throttle, const std::string& method, - content::ResourceType::Type resource_type, + content::ResourceType resource_type, int render_process_id, int render_frame_id, const GURL& url); @@ -57,7 +57,7 @@ class PrerenderResourceThrottle static void WillRedirectRequestOnUI( const base::WeakPtr<PrerenderResourceThrottle>& throttle, const std::string& follow_only_when_prerender_shown_header, - content::ResourceType::Type resource_type, + content::ResourceType resource_type, bool async, int render_process_id, int render_frame_id, diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc index fa4330e..eb19533 100644 --- a/chrome/browser/prerender/prerender_tracker_unittest.cc +++ b/chrome/browser/prerender/prerender_tracker_unittest.cc @@ -228,9 +228,13 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) { net::DEFAULT_PRIORITY, &delegate, &url_request_context); - content::ResourceRequestInfo::AllocateForTesting( - &request, ResourceType::IMAGE, NULL, - kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true); + content::ResourceRequestInfo::AllocateForTesting(&request, + content::RESOURCE_TYPE_IMAGE, + NULL, + kDefaultChildId, + kDefaultRouteId, + MSG_ROUTING_NONE, + true); // Install a prerender throttle. PrerenderResourceThrottle throttle(&request); @@ -268,8 +272,13 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) { &delegate, &url_request_context); content::ResourceRequestInfo::AllocateForTesting( - &request, ResourceType::MAIN_FRAME, NULL, - kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true); + &request, + content::RESOURCE_TYPE_MAIN_FRAME, + NULL, + kDefaultChildId, + kDefaultRouteId, + MSG_ROUTING_NONE, + true); // Install a prerender throttle. PrerenderResourceThrottle throttle(&request); @@ -304,9 +313,13 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) { net::DEFAULT_PRIORITY, &delegate, &url_request_context); - content::ResourceRequestInfo::AllocateForTesting( - &request, ResourceType::XHR, NULL, - kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, false); + content::ResourceRequestInfo::AllocateForTesting(&request, + content::RESOURCE_TYPE_XHR, + NULL, + kDefaultChildId, + kDefaultRouteId, + MSG_ROUTING_NONE, + false); // Install a prerender throttle. PrerenderResourceThrottle throttle(&request); diff --git a/chrome/browser/prerender/prerender_util.cc b/chrome/browser/prerender/prerender_util.cc index 67670aa..e7ae9d1 100644 --- a/chrome/browser/prerender/prerender_util.cc +++ b/chrome/browser/prerender/prerender_util.cc @@ -163,10 +163,10 @@ bool IsControlGroupExperiment(uint8 experiment_id) { return experiment_id == 7 || experiment_id == 8; } -void GatherPagespeedData(const ResourceType::Type resource_type, +void GatherPagespeedData(const ResourceType resource_type, const GURL& request_url, const net::HttpResponseHeaders* response_headers) { - if (resource_type != ResourceType::MAIN_FRAME || + if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME || !request_url.SchemeIsHTTPOrHTTPS()) return; diff --git a/chrome/browser/prerender/prerender_util.h b/chrome/browser/prerender/prerender_util.h index 5addd03..7394501 100644 --- a/chrome/browser/prerender/prerender_util.h +++ b/chrome/browser/prerender/prerender_util.h @@ -51,7 +51,7 @@ bool IsControlGroupExperiment(uint8 experiment_id); // Called by URLRequestResponseStarted to gather data about Pagespeed headers // into the Prerender.PagespeedHeader histogram. Public so it can be accessed // by the unit test. -void GatherPagespeedData(const content::ResourceType::Type resource_type, +void GatherPagespeedData(const content::ResourceType resource_type, const GURL& request_url, const net::HttpResponseHeaders* response_headers); diff --git a/chrome/browser/prerender/prerender_util_unittest.cc b/chrome/browser/prerender/prerender_util_unittest.cc index 6ee79a4..528eec8 100644 --- a/chrome/browser/prerender/prerender_util_unittest.cc +++ b/chrome/browser/prerender/prerender_util_unittest.cc @@ -102,7 +102,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { scoped_ptr<base::HistogramSamples> version_samples; // No PageSpeed header. The VersionCounts histogram isn't created yet. - GatherPagespeedData(ResourceType::MAIN_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get()); base::HistogramBase* server_histogram = base::StatisticsRecorder::FindHistogram( "Prerender.PagespeedHeader.ServerCounts"); @@ -119,7 +119,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { // X-Mod-Pagespeed header in expected format. VersionCounts now exists. headers->AddHeader("X-Mod-Pagespeed: 1.2.24.1-2300"); - GatherPagespeedData(ResourceType::MAIN_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get()); base::HistogramBase* version_histogram = base::StatisticsRecorder::FindHistogram( "Prerender.PagespeedHeader.VersionCounts"); @@ -138,7 +138,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { // X-Mod-Pagespeed header in unexpected format. headers->AddHeader("X-Mod-Pagespeed: Powered By PageSpeed!"); - GatherPagespeedData(ResourceType::MAIN_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get()); server_samples = server_histogram->SnapshotSamples(); version_samples = version_histogram->SnapshotSamples(); EXPECT_EQ(++num_responses, server_samples->GetCount(0)); @@ -153,7 +153,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { // X-Page-Speed header in mod_pagespeed format (so ngx_pagespeed). headers->AddHeader("X-Page-Speed: 1.3.25.2-2530"); - GatherPagespeedData(ResourceType::MAIN_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get()); server_samples = server_histogram->SnapshotSamples(); version_samples = version_histogram->SnapshotSamples(); EXPECT_EQ(++num_responses, server_samples->GetCount(0)); @@ -168,7 +168,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { // X-Page-Speed header in PageSpeed Service format. headers->AddHeader("X-Page-Speed: 97_4_bo"); - GatherPagespeedData(ResourceType::MAIN_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get()); server_samples = server_histogram->SnapshotSamples(); version_samples = version_histogram->SnapshotSamples(); EXPECT_EQ(++num_responses, server_samples->GetCount(0)); @@ -183,7 +183,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { // X-Page-Speed header in an unrecognized format (IISpeed in this case). headers->AddHeader("X-Page-Speed: 1.0PS1.2-20130615"); - GatherPagespeedData(ResourceType::MAIN_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get()); server_samples = server_histogram->SnapshotSamples(); version_samples = version_histogram->SnapshotSamples(); EXPECT_EQ(++num_responses, server_samples->GetCount(0)); @@ -195,7 +195,7 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { EXPECT_EQ( num_bucket_33, version_samples->GetCount(33)); // Not a main frame => not counted at all. - GatherPagespeedData(ResourceType::SUB_FRAME, url, headers.get()); + GatherPagespeedData(content::RESOURCE_TYPE_SUB_FRAME, url, headers.get()); server_samples = server_histogram->SnapshotSamples(); version_samples = version_histogram->SnapshotSamples(); EXPECT_EQ( num_responses, server_samples->GetCount(0)); @@ -209,7 +209,8 @@ TEST_F(PrerenderUtilTest, CountPageSpeedHeadersTest) { // Not a http/https URL => not counted at all. GURL data_url("data:image/png;base64,yadda yadda=="); - GatherPagespeedData(ResourceType::MAIN_FRAME, data_url, headers.get()); + GatherPagespeedData( + content::RESOURCE_TYPE_MAIN_FRAME, data_url, headers.get()); server_samples = server_histogram->SnapshotSamples(); version_samples = version_histogram->SnapshotSamples(); EXPECT_EQ( num_responses, server_samples->GetCount(0)); |