Record SB subresource metrics separately from non-subresource metrics

Record SB subresource metrics separately from non-subresource metrics

We want to be able to distinguish between subresource and non-
subresource warnings in UMA stats. This separates them out. It slightly
changes the definition of interstitial.*.malware because it no longer
includes subresource-only interstitials, but I'm OK with that.

BUG=464719
Committed: https://crrev.com/666f3f024752f9fcbfdf5f1a057b8eb1d8072be1
Cr-Commit-Position: refs/heads/master@{#330117}

[felt, 2015-05-13 01:53:52]

felt@chromium.org changed reviewers:
+ mattm@chromium.org

[felt, 2015-05-13 01:54:25]

mattm, PTAL. we used to record this but then it was deprecated when I refactored
& thought we didn't need it anymore. now we need it again.

[Nathan Parker, 2015-05-13 16:18:44]

nparker@chromium.org changed reviewers:
+ nparker@chromium.org

[Nathan Parker, 2015-05-13 16:18:45]

lgtm

https://codereview.chromium.org/1134553005/diff/1/chrome/browser/safe_browsin...
File chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (right):

https://codereview.chromium.org/1134553005/diff/1/chrome/browser/safe_browsin...
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc:496: bool
primary_subresource = false;
nit:
 bool primary_subresource = unsafe_resources_[0].is_subresource;

[mattm, 2015-05-13 18:18:12]

lgtm. Think it's worth noting the change in subresource handling the histogram
description?

[felt, 2015-05-13 18:39:07]

On 2015/05/13 18:18:12, mattm wrote:
> lgtm. Think it's worth noting the change in subresource handling the histogram
> description?

Good idea, done.

[felt, 2015-05-13 18:39:12]

https://codereview.chromium.org/1134553005/diff/1/chrome/browser/safe_browsin...
File chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (right):

https://codereview.chromium.org/1134553005/diff/1/chrome/browser/safe_browsin...
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc:496: bool
primary_subresource = false;
On 2015/05/13 16:18:45, nparker wrote:
> nit:
>  bool primary_subresource = unsafe_resources_[0].is_subresource;

whoops, side effect of earlier testing. fixed

[felt, 2015-05-13 18:39:59]

felt@chromium.org changed reviewers:
+ asvitkine@chromium.org

[felt, 2015-05-13 18:39:59]

asvitkine@chromium.org: Please review histograms.xml

[Alexei Svitkine (slow), 2015-05-14 14:56:35]

lgtm, but should probably have a crbug associated with it

[felt, 2015-05-15 16:11:42]

The CQ bit was checked by felt@chromium.org

[felt, 2015-05-15 16:11:42]

The patchset sent to the CQ was uploaded after l-g-t-m from
nparker@chromium.org, mattm@chromium.org
Link to the patchset: https://codereview.chromium.org/1134553005/#ps20001
(title: "Comments")

[commit-bot: I haz the power, 2015-05-15 16:12:28]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1134553005/20001

[commit-bot: I haz the power, 2015-05-15 17:08:48]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2015-05-15 17:09:49]

Patchset 2 (id:??) landed as
https://crrev.com/666f3f024752f9fcbfdf5f1a057b8eb1d8072be1
Cr-Commit-Position: refs/heads/master@{#330117}