Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171, 636986
Committed: https://crrev.com/54f191f54bfac1f2400a42ece329516e225a2a75
Cr-Commit-Position: refs/heads/master@{#411476}

[estark, 2016-08-09 03:32:24]

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

[commit-bot: I haz the power, 2016-08-09 03:32:50]

Dry run: 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, 2016-08-09 05:11:59]

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

[commit-bot: I haz the power, 2016-08-09 05:12:00]

Dry run: Try jobs failed on following builders:
  win_chromium_rel_ng on master.tryserver.chromium.win (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_...)

[estark, 2016-08-09 18:21:17]

Description was changed from

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

BUG=634171
==========

to

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
 (this CL)
#2: https://codereview.chromium.org/2224023003/
 Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
 Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171
==========

[estark, 2016-08-09 18:22:50]

Description was changed from

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
 (this CL)
#2: https://codereview.chromium.org/2224023003/
 Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
 Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171
==========

to

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171
==========

[estark, 2016-08-09 18:25:50]

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

[estark, 2016-08-09 18:25:51]

felt, PTAL? The actual rename is in security_state_model.h and the rest is
mechanical.

https://codereview.chromium.org/2224023003/diff/1/components/security_state/s...
in the next CL illustrates how I want to use the renamed enum for both
|mixed_content_status| and a new |content_with_cert_errors_status|.

[estark, 2016-08-11 16:02:47]

Description was changed from

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171
==========

to

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171,636986
==========

[felt, 2016-08-11 19:30:27]

I'm not sure i understand what the benefit is of very slightly renaming these,
even after looking at the follow-up CLs. Could you help me understand?

https://codereview.chromium.org/2224193003/diff/40001/components/security_sta...
File components/security_state/security_state_model.h (right):

https://codereview.chromium.org/2224193003/diff/40001/components/security_sta...
components/security_state/security_state_model.h:93: ContentStatus
mixed_content_status;
nit: weird to leave it named mixed_content_status after renaming the enum to
ContentStatus?

[estark, 2016-08-11 20:21:55]

On 2016/08/11 19:30:27, felt wrote:
> I'm not sure i understand what the benefit is of very slightly renaming these,
> even after looking at the follow-up CLs. Could you help me understand?

Sorry, the terminology gets really confusing with this and makes it hard to
explain coherently. Previously, SecurityStateModel only knew about one type of
not-so-secure subresource: mixed content, which could be passive or active. And
previously, we were counting both HTTP subresources and HTTPS-with-cert-errors
subresources as "mixed content", which is the mess I'm trying to fix up. So,
previously, SSM had a single |mixed_content_status| field of type
MixedContentStatus, where if |mixed_content_status| was equal to, for example,
DISPLAYED_MIXED_CONTENT, that could mean either displayed an HTTP subresource or
an HTTPS-with-cert-errors subresource.

What I'd like to do now is separate these two types of insecure subresources
into two fields: |mixed_content_status| and |content_with_cert_errors_status| (I
added the latter in the next CL). |mixed_content_status| will describe the
presence of HTTP subresources, and |content_with_cert_errors_status| will
describe the presence of subresources with cert errors.

Like mixed content, there could be passive content with cert errors, active
content with cert errors, or both on the page. So I want to use the same enum as
the type of both |mixed_content_status| and |content_with_cert_errors_status|,
which is why I'm renaming MixedContentStatus to ContentStatus in this CL. The
enum is basically none/passive/active/both, and it's not specific to mixed
(HTTP) content -- it can be used to describe any type of not-so-secure content
on the page, and in the next CL I'm using it to describe subresources with cert
errors in addition to subresources loaded over HTTP.

Does that make more sense?

> 
>
https://codereview.chromium.org/2224193003/diff/40001/components/security_sta...
> File components/security_state/security_state_model.h (right):
> 
>
https://codereview.chromium.org/2224193003/diff/40001/components/security_sta...
> components/security_state/security_state_model.h:93: ContentStatus
> mixed_content_status;
> nit: weird to leave it named mixed_content_status after renaming the enum to
> ContentStatus?

Hopefully the explanation above also explains why I did it this way; in the next
CL I added |content_with_cert_errors_status| that is also of type ContentStatus.

[felt, 2016-08-11 20:26:56]

On 2016/08/11 20:21:55, estark wrote:
> On 2016/08/11 19:30:27, felt wrote:
> > I'm not sure i understand what the benefit is of very slightly renaming
these,
> > even after looking at the follow-up CLs. Could you help me understand?
> 
> Sorry, the terminology gets really confusing with this and makes it hard to
> explain coherently. Previously, SecurityStateModel only knew about one type of
> not-so-secure subresource: mixed content, which could be passive or active.
And
> previously, we were counting both HTTP subresources and HTTPS-with-cert-errors
> subresources as "mixed content", which is the mess I'm trying to fix up. So,
> previously, SSM had a single |mixed_content_status| field of type
> MixedContentStatus, where if |mixed_content_status| was equal to, for example,
> DISPLAYED_MIXED_CONTENT, that could mean either displayed an HTTP subresource
or
> an HTTPS-with-cert-errors subresource.
> 
> What I'd like to do now is separate these two types of insecure subresources
> into two fields: |mixed_content_status| and |content_with_cert_errors_status|
(I
> added the latter in the next CL). |mixed_content_status| will describe the
> presence of HTTP subresources, and |content_with_cert_errors_status| will
> describe the presence of subresources with cert errors.
> 
> Like mixed content, there could be passive content with cert errors, active
> content with cert errors, or both on the page. So I want to use the same enum
as
> the type of both |mixed_content_status| and |content_with_cert_errors_status|,
> which is why I'm renaming MixedContentStatus to ContentStatus in this CL. The
> enum is basically none/passive/active/both, and it's not specific to mixed
> (HTTP) content -- it can be used to describe any type of not-so-secure content
> on the page, and in the next CL I'm using it to describe subresources with
cert
> errors in addition to subresources loaded over HTTP.
> 
> Does that make more sense?

ohhhh, yes. I see now, thanks.

> 
> > 
> >
>
https://codereview.chromium.org/2224193003/diff/40001/components/security_sta...
> > File components/security_state/security_state_model.h (right):
> > 
> >
>
https://codereview.chromium.org/2224193003/diff/40001/components/security_sta...
> > components/security_state/security_state_model.h:93: ContentStatus
> > mixed_content_status;
> > nit: weird to leave it named mixed_content_status after renaming the enum to
> > ContentStatus?
> 
> Hopefully the explanation above also explains why I did it this way; in the
next
> CL I added |content_with_cert_errors_status| that is also of type
ContentStatus.

[felt, 2016-08-11 20:29:38]

lgtm

[estark, 2016-08-11 20:51:51]

The CQ bit was checked by estark@chromium.org

[commit-bot: I haz the power, 2016-08-11 20:52:18]

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, 2016-08-11 20:55:18]

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

[commit-bot: I haz the power, 2016-08-11 20:55:19]

Try jobs failed on following builders:
  ios-device on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-device/builds...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)
  mac_chromium_compile_dbg_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)

[estark, 2016-08-11 21:04:51]

The CQ bit was checked by estark@chromium.org

[estark, 2016-08-11 21:04:52]

The patchset sent to the CQ was uploaded after l-g-t-m from felt@chromium.org
Link to the patchset: https://codereview.chromium.org/2224193003/#ps60001
(title: "rebase")

[commit-bot: I haz the power, 2016-08-11 21:06:18]

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, 2016-08-12 00:27:49]

Description was changed from

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171,636986
==========

to

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171,636986
==========

[commit-bot: I haz the power, 2016-08-12 00:27:49]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-08-12 00:30:48]

Description was changed from

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171,636986
==========

to

==========
Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

I'm planning to add information about subresources with certificate
errors to SecurityStateModel. This CL renames the MixedContentStatus
enum values to be more generic, so that we can use the same
passive/displayed, active/ran distinction for subresources with cert
errors that we use for mixed content.

#1: https://codereview.chromium.org/2224193003/
  (this CL)
#2: https://codereview.chromium.org/2224023003/
  Teach SecurityStateModel about subresources with cert errors
#3: https://codereview.chromium.org/2225213004/
  Teach SSLHostStateDelegate about subresources with cert errors
#4: https://codereview.chromium.org/2226363002/
  Track subresources with cert errors separately from mixed content

BUG=634171,636986

Committed: https://crrev.com/54f191f54bfac1f2400a42ece329516e225a2a75
Cr-Commit-Position: refs/heads/master@{#411476}
==========

[commit-bot: I haz the power, 2016-08-12 00:30:49]

Patchset 4 (id:??) landed as
https://crrev.com/54f191f54bfac1f2400a42ece329516e225a2a75
Cr-Commit-Position: refs/heads/master@{#411476}