diff options
| author | dbeam <dbeam@chromium.org> | 2015-10-21 12:42:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 19:44:19 +0000 |
| commit | 54b4230a61af7ea9c43fd320ad0330e3f6ebc4df (patch) | |
| tree | a9b5b08433a4b6623c87689b01eaaf4e447a8b00 | |
| parent | 2909e4f9dd11dc19b7a76ab6d61f972d2816575c (diff) | |
| download | chromium_src-54b4230a61af7ea9c43fd320ad0330e3f6ebc4df.zip chromium_src-54b4230a61af7ea9c43fd320ad0330e3f6ebc4df.tar.gz chromium_src-54b4230a61af7ea9c43fd320ad0330e3f6ebc4df.tar.bz2 | |
Fix bug in WebUI UMA logging to report chrome://uber-frame
R=creis@chromium.org
BUG=535059
Review URL: https://codereview.chromium.org/1413323004
Cr-Commit-Position: refs/heads/master@{#355374}
| -rw-r--r-- | chrome/browser/ui/webui/log_web_ui_url_browsertest.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/uber/uber_ui.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc index 20bed1f..60c8304 100644 --- a/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc +++ b/chrome/browser/ui/webui/log_web_ui_url_browsertest.cc @@ -71,10 +71,14 @@ IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) { GURL uber_url(scheme + "://" + chrome::kChromeUIUberHost); uint32 uber_url_hash = base::Hash(uber_url.spec()); + GURL uber_frame_url(chrome::kChromeUIUberFrameURL); + uint32 uber_frame_url_hash = base::Hash(uber_frame_url.spec()); + GURL history_frame_url(chrome::kChromeUIHistoryFrameURL); uint32 history_frame_url_hash = base::Hash(history_frame_url.spec()); EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 1), + Bucket(uber_frame_url_hash, 1), Bucket(uber_url_hash, 1))); { @@ -84,6 +88,7 @@ IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) { } EXPECT_THAT(GetSamples(), ElementsAre(Bucket(history_frame_url_hash, 2), + Bucket(uber_frame_url_hash, 2), Bucket(uber_url_hash, 2))); { @@ -102,6 +107,7 @@ IN_PROC_BROWSER_TEST_F(LogWebUIUrlTest, TestUberPage) { EXPECT_THAT(GetSamples(), ElementsAre(Bucket(extensions_frame_url_hash, 1), Bucket(history_frame_url_hash, 2), + Bucket(uber_frame_url_hash, 2), Bucket(uber_url_hash, 2))); } #endif diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc index 52c0665..1b85e96 100644 --- a/chrome/browser/ui/webui/uber/uber_ui.cc +++ b/chrome/browser/ui/webui/uber/uber_ui.cc @@ -144,7 +144,7 @@ void SubframeLogger::DidCommitProvisionalLoadForFrame( url == GURL(chrome::kChromeUIHelpFrameURL) || url == GURL(chrome::kChromeUIHistoryFrameURL) || url == GURL(chrome::kChromeUISettingsFrameURL) || - url == GURL(chrome::kChromeUIHelpFrameURL)) { + url == GURL(chrome::kChromeUIUberFrameURL)) { webui::LogWebUIUrl(url); } } |