Index: chrome/browser/tab_contents/navigation_metrics_recorder.cc |
diff --git a/chrome/browser/tab_contents/navigation_metrics_recorder.cc b/chrome/browser/tab_contents/navigation_metrics_recorder.cc |
index f1475d1edf555211d39a8cc76883d8ed51dd6476..25ad6b38a43e9490a51848bb3d6812d9439db926 100644 |
--- a/chrome/browser/tab_contents/navigation_metrics_recorder.cc |
+++ b/chrome/browser/tab_contents/navigation_metrics_recorder.cc |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/tab_contents/navigation_metrics_recorder.h" |
#include "base/metrics/histogram.h" |
+#include "components/navigation_metrics/navigation_metrics.h" |
#include "content/public/browser/navigation_details.h" |
#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/render_view_host.h" |
@@ -17,52 +18,6 @@ |
DEFINE_WEB_CONTENTS_USER_DATA_KEY(NavigationMetricsRecorder); |
-namespace { |
- |
-enum Scheme { |
- SCHEME_UNKNOWN, |
- SCHEME_HTTP, |
- SCHEME_HTTPS, |
- SCHEME_FILE, |
- SCHEME_FTP, |
- SCHEME_DATA, |
- SCHEME_JAVASCRIPT, |
- SCHEME_ABOUT, |
- SCHEME_CHROME, |
- SCHEME_MAX, |
-}; |
- |
-static const char* kSchemeNames[] = { |
- "unknown", |
- "http", |
- "https", |
- "file", |
- "ftp", |
- "data", |
- "javascript", |
- "about", |
- "chrome", |
- "max", |
-}; |
- |
-COMPILE_ASSERT(arraysize(kSchemeNames) == SCHEME_MAX + 1, |
- NavigationMetricsRecorder_name_count_mismatch); |
- |
-void RecordMainFrameNavigation(const content::LoadCommittedDetails& details) { |
- GURL url = details.entry->GetVirtualURL(); |
- Scheme scheme = SCHEME_UNKNOWN; |
- for (int i = 1; i < SCHEME_MAX; ++i) { |
- if (url.SchemeIs(kSchemeNames[i])) { |
- scheme = static_cast<Scheme>(i); |
- break; |
- } |
- } |
- UMA_HISTOGRAM_ENUMERATION( |
- "Navigation.MainFrameScheme", scheme, SCHEME_MAX); |
-} |
- |
-} // namespace |
- |
NavigationMetricsRecorder::NavigationMetricsRecorder( |
content::WebContents* web_contents) |
: content::WebContentsObserver(web_contents) { |
@@ -74,7 +29,7 @@ NavigationMetricsRecorder::~NavigationMetricsRecorder() { |
void NavigationMetricsRecorder::DidNavigateMainFrame( |
const content::LoadCommittedDetails& details, |
const content::FrameNavigateParams& params) { |
- RecordMainFrameNavigation(details); |
+ navigation_metrics::RecordMainFrameNavigation(details.entry->GetVirtualURL()); |
} |
void NavigationMetricsRecorder::DidStartLoading( |