Skip to content

GitLab

T
tangled
Commit f4877890 authored by davidben's avatar davidben Committed by Commit bot
Browse files
Options

Move mod_pagespeed metrics out of prerender. 

The metrics don't have much to do with prerender. Move them out into a
dedicated file.

BUG=none

Review URL: https://codereview.chromium.org/1051463003

Cr-Commit-Position: refs/heads/master@{#324358}
parent 65a9d1d2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 364 additions and 305 deletions
chrome/browser/mod_pagespeed/mod_pagespeed_metrics.cc 0 → 100644
View file @ f4877890
// Copyright 2015 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/mod_pagespeed/mod_pagespeed_metrics.h"
#include <stdio.h>
#include <string>
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
#include "net/http/http_response_headers.h"
#include "url/gurl.h"
namespace mod_pagespeed {
namespace {
const char kModPagespeedHeader[] = "X-Mod-Pagespeed";
const char kPageSpeedHeader[] = "X-Page-Speed";
// For historical reasons, mod_pagespeed usage metrics are named with a
// prerender prefix.
const char kPagespeedServerHistogram[] =
"Prerender.PagespeedHeader.ServerCounts";
const char kPagespeedVersionHistogram[] =
"Prerender.PagespeedHeader.VersionCounts";
enum PagespeedHeaderServerType {
PAGESPEED_TOTAL_RESPONSES = 0,
PAGESPEED_MOD_PAGESPEED_SERVER = 1,
PAGESPEED_NGX_PAGESPEED_SERVER = 2,
PAGESPEED_PAGESPEED_SERVICE_SERVER = 3,
PAGESPEED_UNKNOWN_SERVER = 4,
PAGESPEED_SERVER_MAXIMUM = 5
};
// Parse the PageSpeed version number and encodes it in buckets 2 through 99: if
// it is in the format MAJOR.MINOR.BRANCH.POINT-COMMIT the bucket will be 2 + 2
// * (max(BRANCH, 10) - 10) + (POINT > 1 ? 1 : 0); otherwise the bucket is
// zero.
int GetXModPagespeedBucketFromVersion(const std::string& version) {
int unused_major, unused_minor, branch, point, unused_commit;
int num_parsed = sscanf(version.c_str(), "%d.%d.%d.%d-%d", &unused_major,
&unused_minor, &branch, &point, &unused_commit);
int output = 0;
if (num_parsed == 5) {
output = 2;
if (branch > 10)
output += 2 * (branch - 10);
if (point > 1)
output++;
if (output < 2 || output > 99)
output = 0;
}
return output;
}
// Parse the X-Page-Speed header value and determine whether it is in the
// PageSpeed Service format, namely MAJOR_MINOR_AB were MAJOR_MINOR is a version
// number and AB is an encoded 2-character value.
bool IsPageSpeedServiceVersionNumber(const std::string& version) {
int major, minor;
// is_eol is to detect EOL as we check that it /isn't/ converted.
char a, b, is_eol;
int num_parsed =
sscanf(version.c_str(), "%d_%d_%c%c%c", &major, &minor, &a, &b, &is_eol);
return (num_parsed == 4);
}
} // namespace
void RecordMetrics(const content::ResourceType resource_type,
const GURL& request_url,
const net::HttpResponseHeaders* response_headers) {
if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME ||
!request_url.SchemeIsHTTPOrHTTPS()) {
return;
}
// Bucket 0 counts every response seen.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_TOTAL_RESPONSES,
PAGESPEED_SERVER_MAXIMUM);
if (!response_headers)
return;
void* iter = nullptr;
std::string name;
std::string value;
while (response_headers->EnumerateHeaderLines(&iter, &name, &value)) {
if (name == kModPagespeedHeader) {
// Bucket 1 counts occurrences of the X-Mod-Pagespeed header.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_MOD_PAGESPEED_SERVER,
PAGESPEED_SERVER_MAXIMUM);
if (!value.empty()) {
// If the header value is in the X-Mod-Pagespeed version number format
// then increment the appropriate bucket, otherwise increment bucket 1,
// which is the catch-all "unknown version number" bucket.
int bucket = GetXModPagespeedBucketFromVersion(value);
if (bucket > 0) {
UMA_HISTOGRAM_SPARSE_SLOWLY(kPagespeedVersionHistogram, bucket);
} else {
UMA_HISTOGRAM_SPARSE_SLOWLY(kPagespeedVersionHistogram, 1);
}
}
break;
} else if (name == kPageSpeedHeader) {
// X-Page-Speed header versions are either in the X-Mod-Pagespeed format,
// indicating an nginx installation, or they're in the PageSpeed Service
// format, indicating a PSS installation, or in some other format,
// indicating an unknown installation [possibly IISpeed].
if (!value.empty()) {
int bucket = GetXModPagespeedBucketFromVersion(value);
if (bucket > 0) {
// Bucket 2 counts occurences of the X-Page-Speed header with a
// value in the X-Mod-Pagespeed version number format. We also
// count these responses in the version histogram.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_NGX_PAGESPEED_SERVER,
PAGESPEED_SERVER_MAXIMUM);
UMA_HISTOGRAM_SPARSE_SLOWLY(kPagespeedVersionHistogram, bucket);
} else if (IsPageSpeedServiceVersionNumber(value)) {
// Bucket 3 counts occurences of the X-Page-Speed header with a
// value in the PageSpeed Service version number format.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_PAGESPEED_SERVICE_SERVER,
PAGESPEED_SERVER_MAXIMUM);
} else {
// Bucket 4 counts occurences of all other values.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_UNKNOWN_SERVER,
PAGESPEED_SERVER_MAXIMUM);
}
}
break;
}
}
}
} // namespace mod_pagespeed
chrome/browser/mod_pagespeed/mod_pagespeed_metrics.h 0 → 100644
View file @ f4877890
// Copyright 2015 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.
#ifndef CHROME_BROWSER_MOD_PAGESPEED_MOD_PAGESPEED_METRICS_H_
#define CHROME_BROWSER_MOD_PAGESPEED_MOD_PAGESPEED_METRICS_H_
#include "content/public/common/resource_type.h"
class GURL;
namespace net {
class HttpResponseHeaders;
}
namespace mod_pagespeed {
// Records metrics about mod_pagespeed headers.
//
// See
// https://developers.google.com/speed/pagespeed/module/configuration#XHeaderValue
void RecordMetrics(const content::ResourceType resource_type,
const GURL& request_url,
const net::HttpResponseHeaders* response_headers);
} // namespace mod_pagespeed
#endif // CHROME_BROWSER_MOD_PAGESPEED_MOD_PAGESPEED_METRICS_H_
chrome/browser/mod_pagespeed/mod_pagespeed_metrics_unittest.cc 0 → 100644
View file @ f4877890
// Copyright 2015 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/mod_pagespeed/mod_pagespeed_metrics.h"
#include <algorithm>
#include <string>
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/metrics/histogram_samples.h"
#include "base/metrics/statistics_recorder.h"
#include "content/public/common/resource_type.h"
#include "net/http/http_response_headers.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
namespace mod_pagespeed {
// Ensure that we count PageSpeed headers correctly.
TEST(ModPagespeedMetricsTest, CountPageSpeedHeadersTest) {
base::StatisticsRecorder::Initialize();
GURL url("http://google.com");
std::string temp("HTTP/1.1 200 OK\n\n");
std::replace(temp.begin(), temp.end(), '\n', '\0');
scoped_refptr<net::HttpResponseHeaders> headers(
new net::HttpResponseHeaders(temp));
int num_responses = 0;
int num_mps = 0;
int num_ngx = 0;
int num_pss = 0;
int num_other = 0;
int num_bucket_1 = 0; // unrecognized format/value bucket
int num_bucket_30 = 0; // 1.2.24.1 bucket
int num_bucket_33 = 0; // 1.3.25.2 bucket
scoped_ptr<base::HistogramSamples> server_samples;
scoped_ptr<base::HistogramSamples> version_samples;
// No PageSpeed header. The VersionCounts histogram isn't created yet.
RecordMetrics(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get());
base::HistogramBase* server_histogram =
base::StatisticsRecorder::FindHistogram(
"Prerender.PagespeedHeader.ServerCounts");
ASSERT_TRUE(server_histogram != NULL);
ASSERT_TRUE(NULL == base::StatisticsRecorder::FindHistogram(
"Prerender.PagespeedHeader.VersionCounts"));
server_samples = server_histogram->SnapshotSamples();
EXPECT_EQ(++num_responses, server_samples->GetCount(0));
EXPECT_EQ(num_mps, server_samples->GetCount(1));
EXPECT_EQ(num_ngx, server_samples->GetCount(2));
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(num_other, server_samples->GetCount(4));
// X-Mod-Pagespeed header in expected format. VersionCounts now exists.
headers->AddHeader("X-Mod-Pagespeed: 1.2.24.1-2300");
RecordMetrics(content::RESOURCE_TYPE_MAIN_FRAME, url, headers.get());
base::HistogramBase* version_histogram =
base::StatisticsRecorder::FindHistogram(
"Prerender.PagespeedHeader.VersionCounts");
ASSERT_TRUE(version_histogram != NULL);
server_samples = server_histogram->SnapshotSamples();
version_samples = version_histogram->SnapshotSamples();
EXPECT_EQ(++num_responses, server_samples->GetCount(0));
EXPECT_EQ(++num_mps, server_samples->GetCount(1));
EXPECT_EQ(num_ngx, server_samples->GetCount(2));
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(num_other, server_samples->GetCount(4));
EXPECT_EQ(num_bucket_1, version_samples->GetCount(1));
EXPECT_EQ(++num_bucket_30, version_samples->GetCount(30)); // +1 for #30
EXPECT_EQ(num_bucket_33, version_samples->GetCount(33));
headers->RemoveHeader("X-Mod-Pagespeed");
// X-Mod-Pagespeed header in unexpected format.
headers->AddHeader("X-Mod-Pagespeed: Powered By PageSpeed!");
RecordMetrics(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));
EXPECT_EQ(++num_mps, server_samples->GetCount(1));
EXPECT_EQ(num_ngx, server_samples->GetCount(2));
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(num_other, server_samples->GetCount(4));
EXPECT_EQ(++num_bucket_1, version_samples->GetCount(1)); // +1 for 'huh?'
EXPECT_EQ(num_bucket_30, version_samples->GetCount(30));
EXPECT_EQ(num_bucket_33, version_samples->GetCount(33));
headers->RemoveHeader("X-Mod-Pagespeed");
// X-Page-Speed header in mod_pagespeed format (so ngx_pagespeed).
headers->AddHeader("X-Page-Speed: 1.3.25.2-2530");
RecordMetrics(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));
EXPECT_EQ(num_mps, server_samples->GetCount(1));
EXPECT_EQ(++num_ngx, server_samples->GetCount(2));
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(num_other, server_samples->GetCount(4));
EXPECT_EQ(num_bucket_1, version_samples->GetCount(1));
EXPECT_EQ(num_bucket_30, version_samples->GetCount(30));
EXPECT_EQ(++num_bucket_33, version_samples->GetCount(33)); // +1 for #33
headers->RemoveHeader("X-Page-Speed");
// X-Page-Speed header in PageSpeed Service format.
headers->AddHeader("X-Page-Speed: 97_4_bo");
RecordMetrics(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));
EXPECT_EQ(num_mps, server_samples->GetCount(1)); // no change
EXPECT_EQ(num_ngx, server_samples->GetCount(2));
EXPECT_EQ(++num_pss, server_samples->GetCount(3)); // +1 for PSS
EXPECT_EQ(num_other, server_samples->GetCount(4));
EXPECT_EQ(num_bucket_1, version_samples->GetCount(1));
EXPECT_EQ(num_bucket_30, version_samples->GetCount(30));
EXPECT_EQ(num_bucket_33, version_samples->GetCount(33));
headers->RemoveHeader("X-Page-Speed");
// X-Page-Speed header in an unrecognized format (IISpeed in this case).
headers->AddHeader("X-Page-Speed: 1.0PS1.2-20130615");
RecordMetrics(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));
EXPECT_EQ(num_mps, server_samples->GetCount(1)); // no change
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(++num_other, server_samples->GetCount(4)); // +1 for 'other'
EXPECT_EQ(num_bucket_1, version_samples->GetCount(1));
EXPECT_EQ(num_bucket_30, version_samples->GetCount(30));
EXPECT_EQ(num_bucket_33, version_samples->GetCount(33));
// Not a main frame => not counted at all.
RecordMetrics(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));
EXPECT_EQ(num_mps, server_samples->GetCount(1));
EXPECT_EQ(num_ngx, server_samples->GetCount(2));
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(num_other, server_samples->GetCount(4));
EXPECT_EQ(num_bucket_1, version_samples->GetCount(1));
EXPECT_EQ(num_bucket_30, version_samples->GetCount(30));
EXPECT_EQ(num_bucket_33, version_samples->GetCount(33));
// Not a http/https URL => not counted at all.
GURL data_url("data:image/png;base64,yadda yadda==");
RecordMetrics(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));
EXPECT_EQ(num_mps, server_samples->GetCount(1));
EXPECT_EQ(num_ngx, server_samples->GetCount(2));
EXPECT_EQ(num_pss, server_samples->GetCount(3));
EXPECT_EQ(num_other, server_samples->GetCount(4));
EXPECT_EQ(num_bucket_1, version_samples->GetCount(1));
EXPECT_EQ(num_bucket_30, version_samples->GetCount(30));
EXPECT_EQ(num_bucket_33, version_samples->GetCount(33));
headers->RemoveHeader("X-Page-Speed");
}
} // namespace mod_pagespeed
chrome/browser/prerender/prerender_util.cc
View file @ f4877890
...@@ -22,53 +22,6 @@ namespace prerender { ...@@ -22,53 +22,6 @@ namespace prerender {
namespace { namespace {
const char kModPagespeedHeader[] = "X-Mod-Pagespeed";
const char kPageSpeedHeader[] = "X-Page-Speed";
const char kPagespeedServerHistogram[] =
"Prerender.PagespeedHeader.ServerCounts";
const char kPagespeedVersionHistogram[] =
"Prerender.PagespeedHeader.VersionCounts";
enum PagespeedHeaderServerType {
PAGESPEED_TOTAL_RESPONSES = 0,
PAGESPEED_MOD_PAGESPEED_SERVER = 1,
PAGESPEED_NGX_PAGESPEED_SERVER = 2,
PAGESPEED_PAGESPEED_SERVICE_SERVER = 3,
PAGESPEED_UNKNOWN_SERVER = 4,
PAGESPEED_SERVER_MAXIMUM = 5
};
// Private function to parse the PageSpeed version number and encode it in
// buckets 2 through 99: if it is in the format a.b.c.d-e the bucket will be
// 2 + 2 * (max(c, 10) - 10) + (d > 1 ? 1 : 0); if it is not in this format
// we return zero.
int GetXModPagespeedBucketFromVersion(const std::string& version) {
int a, b, c, d, e;
int num_parsed = sscanf(version.c_str(), "%d.%d.%d.%d-%d",
&a, &b, &c, &d, &e);
int output = 0;
if (num_parsed == 5) {
output = 2;
if (c > 10)
output += 2 * (c - 10);
if (d > 1)
output++;
if (output < 2 || output > 99)
output = 0;
}
return output;
}
// Private function to parse the X-Page-Speed header value and determine
// whether it is in the PageSpeed Service format, namely m_n_dc were m_n is
// a version number and dc is an encoded 2-character value.
bool IsPageSpeedServiceVersionNumber(const std::string& version) {
int a, b;
char c, d, e; // e is to detect EOL as we check that it /isn't/ converted.
int num_parsed = sscanf(version.c_str(), "%d_%d_%c%c%c", &a, &b, &c, &d, &e);
return (num_parsed == 4);
}
enum PrerenderSchemeCancelReason { enum PrerenderSchemeCancelReason {
PRERENDER_SCHEME_CANCEL_REASON_EXTERNAL_PROTOCOL, PRERENDER_SCHEME_CANCEL_REASON_EXTERNAL_PROTOCOL,
PRERENDER_SCHEME_CANCEL_REASON_DATA, PRERENDER_SCHEME_CANCEL_REASON_DATA,
...@@ -163,82 +116,6 @@ bool IsControlGroupExperiment(uint8 experiment_id) { ...@@ -163,82 +116,6 @@ bool IsControlGroupExperiment(uint8 experiment_id) {
return experiment_id == 7 || experiment_id == 8; return experiment_id == 7 || experiment_id == 8;
} }
void GatherPagespeedData(const ResourceType resource_type,
const GURL& request_url,
const net::HttpResponseHeaders* response_headers) {
if (resource_type != content::RESOURCE_TYPE_MAIN_FRAME ||
!request_url.SchemeIsHTTPOrHTTPS())
return;
// bucket 0 counts every response seen.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_TOTAL_RESPONSES,
PAGESPEED_SERVER_MAXIMUM);
if (!response_headers)
return;
void* iter = NULL;
std::string name;
std::string value;
while (response_headers->EnumerateHeaderLines(&iter, &name, &value)) {
if (name == kModPagespeedHeader) {
// Bucket 1 counts occurences of the X-Mod-Pagespeed header.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_MOD_PAGESPEED_SERVER,
PAGESPEED_SERVER_MAXIMUM);
if (!value.empty()) {
// If the header value is in the X-Mod-Pagespeed version number format
// then increment the appropriate bucket, otherwise increment bucket 1,
// which is the catch-all "unknown version number" bucket.
int bucket = GetXModPagespeedBucketFromVersion(value);
if (bucket > 0) {
UMA_HISTOGRAM_SPARSE_SLOWLY(kPagespeedVersionHistogram, bucket);
} else {
UMA_HISTOGRAM_SPARSE_SLOWLY(kPagespeedVersionHistogram, 1);
}
}
break;
} else if (name == kPageSpeedHeader) {
// X-Page-Speed header versions are either in the X-Mod-Pagespeed format,
// indicating an nginx installation, or they're in the PageSpeed Service
// format, indicating a PSS installation, or in some other format,
// indicating an unknown installation [possibly IISpeed].
if (!value.empty()) {
int bucket = GetXModPagespeedBucketFromVersion(value);
if (bucket > 0) {
// Bucket 2 counts occurences of the X-Page-Speed header with a
// value in the X-Mod-Pagespeed version number format. We also
// count these responses in the version histogram.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_NGX_PAGESPEED_SERVER,
PAGESPEED_SERVER_MAXIMUM);
UMA_HISTOGRAM_SPARSE_SLOWLY(kPagespeedVersionHistogram, bucket);
} else if (IsPageSpeedServiceVersionNumber(value)) {
// Bucket 3 counts occurences of the X-Page-Speed header with a
// value in the PageSpeed Service version number format.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_PAGESPEED_SERVICE_SERVER,
PAGESPEED_SERVER_MAXIMUM);
} else {
// Bucket 4 counts occurences of all other values.
UMA_HISTOGRAM_ENUMERATION(kPagespeedServerHistogram,
PAGESPEED_UNKNOWN_SERVER,
PAGESPEED_SERVER_MAXIMUM);
}
}
break;
}
}
}
void URLRequestResponseStarted(net::URLRequest* request) {
const content::ResourceRequestInfo* info =
content::ResourceRequestInfo::ForRequest(request);
GatherPagespeedData(info->GetResourceType(),
request->url(),
request->response_headers());
}
void ReportPrerenderExternalURL() { void ReportPrerenderExternalURL() {
ReportPrerenderSchemeCancelReason( ReportPrerenderSchemeCancelReason(
PRERENDER_SCHEME_CANCEL_REASON_EXTERNAL_PROTOCOL); PRERENDER_SCHEME_CANCEL_REASON_EXTERNAL_PROTOCOL);
......
chrome/browser/prerender/prerender_util.h
View file @ f4877890
...@@ -6,14 +6,8 @@ ...@@ -6,14 +6,8 @@
#define CHROME_BROWSER_PRERENDER_PRERENDER_UTIL_H_ #define CHROME_BROWSER_PRERENDER_PRERENDER_UTIL_H_
#include "base/basictypes.h" #include "base/basictypes.h"
#include "content/public/common/resource_type.h"
#include "url/gurl.h" #include "url/gurl.h"
namespace net {
class HttpResponseHeaders;
class URLRequest;
}
namespace prerender { namespace prerender {
extern const char kChromeNavigateExtraDataKey[]; extern const char kChromeNavigateExtraDataKey[];
...@@ -48,17 +42,6 @@ bool IsNoSwapInExperiment(uint8 experiment_id); ...@@ -48,17 +42,6 @@ bool IsNoSwapInExperiment(uint8 experiment_id);
// iff this is the case for the experiment_id specified. // iff this is the case for the experiment_id specified.
bool IsControlGroupExperiment(uint8 experiment_id); 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 resource_type,
const GURL& request_url,
const net::HttpResponseHeaders* response_headers);
// Static method gathering stats about a URLRequest for which a response has
// just started.
void URLRequestResponseStarted(net::URLRequest* request);
// Report a URL was canceled due to trying to handle an external URL. // Report a URL was canceled due to trying to handle an external URL.
void ReportPrerenderExternalURL(); void ReportPrerenderExternalURL();
......
chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
View file @ f4877890
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "chrome/browser/component_updater/component_updater_resource_throttle.h" #include "chrome/browser/component_updater/component_updater_resource_throttle.h"
#include "chrome/browser/download/download_request_limiter.h" #include "chrome/browser/download/download_request_limiter.h"
#include "chrome/browser/download/download_resource_throttle.h" #include "chrome/browser/download/download_resource_throttle.h"
#include "chrome/browser/mod_pagespeed/mod_pagespeed_metrics.h"
#include "chrome/browser/net/resource_prefetch_predictor_observer.h" #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
#include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/plugins/plugin_prefs.h"
#include "chrome/browser/prefetch/prefetch.h" #include "chrome/browser/prefetch/prefetch.h"
...@@ -688,7 +689,8 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted( ...@@ -688,7 +689,8 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
response_headers->RemoveHeader("x-frame-options"); response_headers->RemoveHeader("x-frame-options");
} }
prerender::URLRequestResponseStarted(request); mod_pagespeed::RecordMetrics(info->GetResourceType(), request->url(),
request->response_headers());
} }
void ChromeResourceDispatcherHostDelegate::OnRequestRedirected( void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
......
chrome/chrome_browser.gypi
View file @ f4877890
...@@ -539,6 +539,8 @@ ...@@ -539,6 +539,8 @@
'browser/memory_details_linux.cc', 'browser/memory_details_linux.cc',
'browser/memory_details_mac.cc', 'browser/memory_details_mac.cc',
'browser/memory_details_win.cc', 'browser/memory_details_win.cc',
'browser/mod_pagespeed/mod_pagespeed_metrics.cc',
'browser/mod_pagespeed/mod_pagespeed_metrics.h',
'browser/native_window_notification_source.h', 'browser/native_window_notification_source.h',
'browser/net/predictor_tab_helper.cc', 'browser/net/predictor_tab_helper.cc',
'browser/net/predictor_tab_helper.h', 'browser/net/predictor_tab_helper.h',
......
chrome/chrome_tests_unit.gypi
View file @ f4877890
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
'browser/metrics/variations/variations_request_scheduler_unittest.cc', 'browser/metrics/variations/variations_request_scheduler_unittest.cc',
'browser/metrics/variations/variations_seed_store_unittest.cc', 'browser/metrics/variations/variations_seed_store_unittest.cc',
'browser/metrics/variations/variations_service_unittest.cc', 'browser/metrics/variations/variations_service_unittest.cc',
'browser/mod_pagespeed/mod_pagespeed_metrics_unittest.cc',
'browser/net/certificate_error_reporter_unittest.cc', 'browser/net/certificate_error_reporter_unittest.cc',
'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc', 'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc',
'browser/net/chrome_network_delegate_unittest.cc', 'browser/net/chrome_network_delegate_unittest.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment