Clean up IndexedRuleset tests; factor out test_support.

Clean up IndexedRuleset tests; factor out test_support.

The new test_support header will be used by UrlPatternIndex tests when these
get introduced.

BUG=713774
Review-Url: https://codereview.chromium.org/2865643002
Cr-Commit-Position: refs/heads/master@{#469624}
Committed: https://chromium.googlesource.com/chromium/src/+/4d49107dce95a5491acebfab01023a377ae03b58

[pkalinnikov, 2017-05-05 08:40:50]

The CQ bit was checked by pkalinnikov@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-05 08:41:03]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[pkalinnikov, 2017-05-05 08:41:47]

pkalinnikov@chromium.org changed reviewers:
+ engedy@chromium.org

[pkalinnikov, 2017-05-05 08:41:47]

PTAL.

[engedy, 2017-05-05 09:07:05]

LGTM % nits and provided the tests still pass.

Note that I only skimmed through the unittest itself -- unfortunately, not even
meld did a particularly good job at diffing.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
File components/subresource_filter/core/common/indexed_ruleset_unittest.cc
(right):

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/indexed_ruleset_unittest.cc:662: <<
"ElementTypes: " << (int)rule_data.element_types
nit: I think C-style casts are discouraged, can we use static_cast<int>() here?

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
File components/subresource_filter/core/common/url_rule_test_support.cc (right):

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:5: #include
"components/subresource_filter/core/common/url_rule_test_support.h"
nit: blank line after this

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:11: namespace
subresource_filter {
nit: Let's put this into subresource_filter::testing, where we also have all
other test support.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:33: if
(domain_pattern[0] == '~') {
nit: Mention this in the comment in the header.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:42: return
origin_string.data() ? url::Origin(GURL(origin_string))
Can we use !empty() here instead?

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
File components/subresource_filter/core/common/url_rule_test_support.h (right):

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.h:53: // Creates
a UrlRule with all necessary fields initialized to defaults.
nit: ... with the given |url_pattern|, and all ...

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.h:59: // Returns
Origin from a string. If |origin_string| == nullptr, then returns a
nit: Returns the url::Origin parsed from |origin_string|, or the unique origin
if the string is empty.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.h:63: // Returns
whether |url| is a third-party resource w.r.t. |first_party_origin|.
nit: is third-party

[pkalinnikov, 2017-05-05 09:59:32]

The CQ bit was checked by pkalinnikov@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-05 09:59:45]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[pkalinnikov, 2017-05-05 09:59:54]

Done, thanks.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
File components/subresource_filter/core/common/indexed_ruleset_unittest.cc
(right):

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/indexed_ruleset_unittest.cc:662: <<
"ElementTypes: " << (int)rule_data.element_types
On 2017/05/05 09:07:05, engedy wrote:
> nit: I think C-style casts are discouraged, can we use static_cast<int>()
here?

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
File components/subresource_filter/core/common/url_rule_test_support.cc (right):

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:5: #include
"components/subresource_filter/core/common/url_rule_test_support.h"
On 2017/05/05 09:07:05, engedy wrote:
> nit: blank line after this

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:11: namespace
subresource_filter {
On 2017/05/05 09:07:05, engedy wrote:
> nit: Let's put this into subresource_filter::testing, where we also have all
> other test support.

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:33: if
(domain_pattern[0] == '~') {
On 2017/05/05 09:07:05, engedy wrote:
> nit: Mention this in the comment in the header.

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.cc:42: return
origin_string.data() ? url::Origin(GURL(origin_string))
On 2017/05/05 09:07:05, engedy wrote:
> Can we use !empty() here instead?

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
File components/subresource_filter/core/common/url_rule_test_support.h (right):

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.h:53: // Creates
a UrlRule with all necessary fields initialized to defaults.
On 2017/05/05 09:07:05, engedy wrote:
> nit: ... with the given |url_pattern|, and all ...

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.h:59: // Returns
Origin from a string. If |origin_string| == nullptr, then returns a
On 2017/05/05 09:07:05, engedy wrote:
> nit: Returns the url::Origin parsed from |origin_string|, or the unique origin
> if the string is empty.

Done.

https://codereview.chromium.org/2865643002/diff/1/components/subresource_filt...
components/subresource_filter/core/common/url_rule_test_support.h:63: // Returns
whether |url| is a third-party resource w.r.t. |first_party_origin|.
On 2017/05/05 09:07:05, engedy wrote:
> nit: is third-party

Done.

[commit-bot: I haz the power, 2017-05-05 10:59:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-05-05 10:59:59]

Dry run: This issue passed the CQ dry run.

[pkalinnikov, 2017-05-05 11:09:59]

The CQ bit was checked by pkalinnikov@chromium.org

[pkalinnikov, 2017-05-05 11:10:00]

The patchset sent to the CQ was uploaded after l-g-t-m from engedy@chromium.org
Link to the patchset: https://codereview.chromium.org/2865643002/#ps20001
(title: "Address comments from engedy@.")

[commit-bot: I haz the power, 2017-05-05 11:10:06]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-05 11:14:39]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1493982599640290,
"parent_rev": "f92fd977be7cd346c693e88e8de19ee4e3b914b3", "commit_rev":
"4d49107dce95a5491acebfab01023a377ae03b58"}

[commit-bot: I haz the power, 2017-05-05 11:15:10]

Description was changed from

==========
Clean up IndexedRuleset tests; factor out test_support.

The new test_support header will be used by UrlPatternIndex tests when these
get introduced.

BUG=713774
==========

to

==========
Clean up IndexedRuleset tests; factor out test_support.

The new test_support header will be used by UrlPatternIndex tests when these
get introduced.

BUG=713774

Review-Url: https://codereview.chromium.org/2865643002
Cr-Commit-Position: refs/heads/master@{#469624}
Committed:
https://chromium.googlesource.com/chromium/src/+/4d49107dce95a5491acebfab0102...
==========

[commit-bot: I haz the power, 2017-05-05 11:15:11]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/4d49107dce95a5491acebfab0102...