Fix privacy whitepaper link

Fix privacy whitepaper link on safe browsing blocking page and captive
portal bloking page (whitepaper links on other interstitials are fine).
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823, 667385
Committed: https://crrev.com/762fb54cd325ae2f557a3a8f9199daa480f8f8b7
Cr-Commit-Position: refs/heads/master@{#434546}

[Jialiu Lin, 2016-11-22 19:36:43]

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

[commit-bot: I haz the power, 2016-11-22 19:37:15]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Jialiu Lin, 2016-11-22 19:39:59]

jialiul@chromium.org changed reviewers:
+ cpu@chromium.org, meacer@chromium.org

[Jialiu Lin, 2016-11-22 19:39:59]

meacer@, could you take a look at the c/b/ssl/captive_portal_blocking_page.cc
cpu@, could you take a look at change in generated_resources.grd

Thanks,

[meacer, 2016-11-22 19:57:23]

https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
File chrome/browser/ssl/captive_portal_blocking_page.cc (right):

https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
chrome/browser/ssl/captive_portal_blocking_page.cc:238: break;
Captive portal interstitial only has a single "Connect" button without any links
(chrome://interstitials/captiveportal), so I'm not sure if this code can
actually be reached? Should we actually put a "learn more" link?

[commit-bot: I haz the power, 2016-11-22 20:36:39]

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

[commit-bot: I haz the power, 2016-11-22 20:36:39]

Dry run: This issue passed the CQ dry run.

[Jialiu Lin, 2016-11-22 21:03:17]

Description was changed from

==========
Fix privacy whitepaper link on safe browsing blocking page and captive
portal blocking page (whitepaper links on other interstitials are fine)
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823,667385
==========

to

==========
Fix privacy whitepaper link on safe browsing blocking page (whitepaper
links on other interstitials are fine).
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823,667385
==========

[Jialiu Lin, 2016-11-22 21:06:13]

https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
File chrome/browser/ssl/captive_portal_blocking_page.cc (right):

https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
chrome/browser/ssl/captive_portal_blocking_page.cc:238: break;
On 2016/11/22 at 19:57:23, Mustafa Emre Acer wrote:
> Captive portal interstitial only has a single "Connect" button without any
links (chrome://interstitials/captiveportal), so I'm not sure if this code can
actually be reached? Should we actually put a "learn more" link?

Thanks for catching this! I didn't read the code careful enough. I though every
SecurityInterstitial subclass would have a SBER opt-in checkbox (And apparently
it is not the case :-P).
I reverted the change made on captive_portal_clocking_page.cc
CL description fixed too.

[meacer, 2016-11-22 21:25:22]

https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
File chrome/browser/ssl/captive_portal_blocking_page.cc (right):

https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
chrome/browser/ssl/captive_portal_blocking_page.cc:238: break;
On 2016/11/22 21:06:13, Jialiu Lin wrote:
> On 2016/11/22 at 19:57:23, Mustafa Emre Acer wrote:
> > Captive portal interstitial only has a single "Connect" button without any
> links (chrome://interstitials/captiveportal), so I'm not sure if this code can
> actually be reached? Should we actually put a "learn more" link?
> 
> Thanks for catching this! I didn't read the code careful enough. I though
every
> SecurityInterstitial subclass would have a SBER opt-in checkbox (And
apparently
> it is not the case :-P).
> I reverted the change made on captive_portal_clocking_page.cc
> CL description fixed too.

Apologies, I'm mistaken. We do in fact show the SBER opt-in checkbox, but the
chrome://interstitials page doesn't do that.

I'm guessing "Automatically report" link opens the privacy whitepaper? If so,
this LGTM.

[meacer, 2016-11-22 21:25:46]

On 2016/11/22 21:25:22, Mustafa Emre Acer wrote:
>
https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
> File chrome/browser/ssl/captive_portal_blocking_page.cc (right):
> 
>
https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
> chrome/browser/ssl/captive_portal_blocking_page.cc:238: break;
> On 2016/11/22 21:06:13, Jialiu Lin wrote:
> > On 2016/11/22 at 19:57:23, Mustafa Emre Acer wrote:
> > > Captive portal interstitial only has a single "Connect" button without any
> > links (chrome://interstitials/captiveportal), so I'm not sure if this code
can
> > actually be reached? Should we actually put a "learn more" link?
> > 
> > Thanks for catching this! I didn't read the code careful enough. I though
> every
> > SecurityInterstitial subclass would have a SBER opt-in checkbox (And
> apparently
> > it is not the case :-P).
> > I reverted the change made on captive_portal_clocking_page.cc
> > CL description fixed too.
> 
> Apologies, I'm mistaken. We do in fact show the SBER opt-in checkbox, but the
> chrome://interstitials page doesn't do that.
> 
> I'm guessing "Automatically report" link opens the privacy whitepaper? If so,
> this LGTM.

LGTM for patchset #1, btw, not #2.

[Jialiu Lin, 2016-11-22 21:36:49]

Description was changed from

==========
Fix privacy whitepaper link on safe browsing blocking page (whitepaper
links on other interstitials are fine).
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823,667385
==========

to

==========
Fix privacy whitepaper link on safe browsing blocking page and captive
portal bloking page (whitepaper links on other interstitials are fine).
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823,667385
==========

[Jialiu Lin, 2016-11-22 21:38:39]

On 2016/11/22 at 21:25:22, meacer wrote:
>
https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
> File chrome/browser/ssl/captive_portal_blocking_page.cc (right):
> 
>
https://codereview.chromium.org/2526543002/diff/1/chrome/browser/ssl/captive_...
> chrome/browser/ssl/captive_portal_blocking_page.cc:238: break;
> On 2016/11/22 21:06:13, Jialiu Lin wrote:
> > On 2016/11/22 at 19:57:23, Mustafa Emre Acer wrote:
> > > Captive portal interstitial only has a single "Connect" button without any
> > links (chrome://interstitials/captiveportal), so I'm not sure if this code
can
> > actually be reached? Should we actually put a "learn more" link?
> > 
> > Thanks for catching this! I didn't read the code careful enough. I though
every
> > SecurityInterstitial subclass would have a SBER opt-in checkbox (And
apparently
> > it is not the case :-P).
> > I reverted the change made on captive_portal_clocking_page.cc
> > CL description fixed too.
> 
> Apologies, I'm mistaken. We do in fact show the SBER opt-in checkbox, but the
chrome://interstitials page doesn't do that.
> 
> I'm guessing "Automatically report" link opens the privacy whitepaper? If so,
this LGTM.
Yes, "Automatically report" links to the privacy whitepaper.  Changes added back
to captive portal. 
Thanks for your lgtm! :-)

[Jialiu Lin, 2016-11-23 17:18:39]

jialiul@chromium.org changed reviewers:
+ grt@chromium.org
- cpu@chromium.org

[Jialiu Lin, 2016-11-23 17:18:39]

-cpu@, +grt@, since cpu@ is OOO this week. 

Thanks!

[grt (UTC plus 2), 2016-11-24 07:58:58]

rubberstamp lgtm

[Jialiu Lin, 2016-11-25 18:23:22]

The CQ bit was checked by jialiul@chromium.org

[Jialiu Lin, 2016-11-25 18:23:22]

The patchset sent to the CQ was uploaded after l-g-t-m from meacer@chromium.org
Link to the patchset: https://codereview.chromium.org/2526543002/#ps40001
(title: "add back change in captive_portal_blocking_page")

[commit-bot: I haz the power, 2016-11-25 18:23:32]

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-11-25 20:43:16]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1480098202319920,
"parent_rev": "f3f42bf1340b78498cbfb65ecda04812c084f3b6", "commit_rev":
"5110c0932a833e9100abdded728fbe37e7e2c3c9"}

[commit-bot: I haz the power, 2016-11-25 20:43:40]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-11-25 20:45:59]

Description was changed from

==========
Fix privacy whitepaper link on safe browsing blocking page and captive
portal bloking page (whitepaper links on other interstitials are fine).
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823,667385
==========

to

==========
Fix privacy whitepaper link on safe browsing blocking page and captive
portal bloking page (whitepaper links on other interstitials are fine).
Link privacy whitepaper to "system information and page content" instead
of "Automatically send" on Scout opt-in string.

BUG=667823,667385

Committed: https://crrev.com/762fb54cd325ae2f557a3a8f9199daa480f8f8b7
Cr-Commit-Position: refs/heads/master@{#434546}
==========

[commit-bot: I haz the power, 2016-11-25 20:46:00]

Patchset 3 (id:??) landed as
https://crrev.com/762fb54cd325ae2f557a3a8f9199daa480f8f8b7
Cr-Commit-Position: refs/heads/master@{#434546}