Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

In preparation for adding a 'quiet' version of the Safe Browsing interstitial UI.

BUG=716096
Review-Url: https://codereview.chromium.org/2852333003
Cr-Commit-Position: refs/heads/master@{#471479}
Committed: https://chromium.googlesource.com/chromium/src/+/d7395fb0478f05e183d9aa649ef72e859987c84f

[edwardjung, 2017-05-02 16:44:41]

Description was changed from

==========
UI changes for Safe Browsing interstitials in WebView

BUG=716096
==========

to

==========
Safe Browsing interstitials UI changes to support WebView

BUG=716096
==========

[edwardjung, 2017-05-02 17:13:59]

Tweaks for the current interstitial. Let me know if this direction looks okay.

- SBErrorDisplayOptions already has a flag for the checkbox
- For the back button, I'm reusing the existing 'hide_primary_button' logic
created for bad clock to hide it. Should this be a settable DisplayOption?
- Would a flag be set somewhere to indicate it's WebView or should it be relying
on DisplayOptions.

I'll rename this to SafeBrowsingLoudErrorUI

Thanks.

[edwardjung, 2017-05-02 23:44:03]

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

[edwardjung, 2017-05-02 23:44:03]

Tweaks for the current interstitial. Let me know if this direction looks okay.

- SBErrorDisplayOptions already has a flag for the checkbox
- For the back button, I'm reusing the existing 'hide_primary_button' logic
created for bad clock to hide it. Should this be a settable DisplayOption?
- Would a flag be set somewhere to indicate it's WebView or should it be relying
on DisplayOptions.

- Also attempted the rename to SafeBrowsingLoudErrorUI and setting up
BaseSafeBrowsingErrorUI which I know looks terrible and has some linking errors.
Any guidance is most helpful.

I have the quiet interstitial almost ready which I'll put in a separate CL.

Thanks.

[felt, 2017-05-03 17:12:35]

I'd highly recommend splitting the class renaming & the actual changes into
separate CLs. I think it'll make landing this easier plus keep the revision
history cleaner.

(I'll respond with more detailed comments in my next mail)

[felt, 2017-05-03 18:17:02]

https://codereview.chromium.org/2852333003/diff/20001/chrome/browser/safe_bro...
File chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (right):

https://codereview.chromium.org/2852333003/diff/20001/chrome/browser/safe_bro...
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc:191:
->base_safe_browsing_error_ui.is_extended_reporting_opt_in_allowed();
If sb_error_ui returned a BaseSafeBrowsingErrorUI, you would be able to directly
access these getters off of it.

https://codereview.chromium.org/2852333003/diff/20001/components/safe_browsin...
File components/safe_browsing/base_blocking_page.h (right):

https://codereview.chromium.org/2852333003/diff/20001/components/safe_browsin...
components/safe_browsing/base_blocking_page.h:138:
std::unique_ptr<SafeBrowsingLoudErrorUI> sb_error_ui_;
My recommendation is to make this variable a Base class, not the Loud or Quiet
class. That way, the Loud and Quiet classes don't need their own Base member
variable.

The Base Blocking Page shouldn't care whether it's a Loud or Quiet class, except
when instantiating. All the other methods (the public "interface"?) should be
shared between the Loud and Quiet classes.

https://codereview.chromium.org/2852333003/diff/20001/components/security_int...
File components/security_interstitials/core/browser/resources/interstitial_v2.js
(right):

https://codereview.chromium.org/2852333003/diff/20001/components/security_int...
components/security_interstitials/core/browser/resources/interstitial_v2.js:107:
'hide_primary_button');
I don't think we need this webView variable. We should probably get rid of the
|badClock| check here too. Just set 

hidePrimaryButton = loadTimeData.getBoolean('hide_primary_button')

I think I just added the |badClock| check as a sanity check, since previously
there weren't other situations where |hide_primary_button| was set. But, that's
changing now, and we don't really need to maintain a full list.

https://codereview.chromium.org/2852333003/diff/20001/components/security_int...
File components/security_interstitials/core/controller_client.h (right):

https://codereview.chromium.org/2852333003/diff/20001/components/security_int...
components/security_interstitials/core/controller_client.h:95: virtual bool
IsWebView() = 0;
Instead of adding "IsWebView()", there should be a method "CanGoBack()". In the
future, some WebViews will allow going back and some won't, so that interface
will be more robust. Also that setup is parallel to how
CanLaunchDateAndTimeSettings and LaunchDateAndTimeSettings work.

https://codereview.chromium.org/2852333003/diff/20001/components/security_int...
File components/security_interstitials/core/safe_browsing_loud_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/20001/components/security_int...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:40:
BaseSafeBrowsingErrorUI base_safe_browsing_error_ui;
I noticed that you've added the base class as a variable, instead of subclassing
from it. What was the reason for that?

[edwardjung, 2017-05-04 12:30:18]

Description was changed from

==========
Safe Browsing interstitials UI changes to support WebView

BUG=716096
==========

to

==========
Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

In preparation for adding a 'quiet' version of the Safe Browsing interstitial
UI.

BUG=716096
==========

[edwardjung, 2017-05-04 20:48:15]

Thanks for the comments.

I refactored this CL to be just for the rename. It's compiling and linking now.
However when viewing any of the SB pages it causes a crash. Highly suspect my
refactor of the BaseBlockingPage.

Thanks.

[felt, 2017-05-05 00:28:29]

What's the crash look like?

https://codereview.chromium.org/2852333003/diff/80001/chrome/browser/safe_bro...
File chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (right):

https://codereview.chromium.org/2852333003/diff/80001/chrome/browser/safe_bro...
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc:19: #include
"components/security_interstitials/core/safe_browsing_loud_error_ui.h"
Is this the right include? Do you need an include for the base class here
instead?

https://codereview.chromium.org/2852333003/diff/80001/components/safe_browsin...
File components/safe_browsing/base_blocking_page.cc (right):

https://codereview.chromium.org/2852333003/diff/80001/components/safe_browsin...
components/safe_browsing/base_blocking_page.cc:15: #include
"components/security_interstitials/core/safe_browsing_loud_error_ui.h"
include?

https://codereview.chromium.org/2852333003/diff/80001/components/safe_browsin...
components/safe_browsing/base_blocking_page.cc:58:
sb_error_ui_(base::MakeUnique<SafeBrowsingLoudErrorUI>(
Is this where it's crashing?

[edwardjung, 2017-05-05 12:11:09]

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

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

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, 2017-05-05 12:20:36]

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

[commit-bot: I haz the power, 2017-05-05 12:20:37]

Dry run: Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[edwardjung, 2017-05-05 17:06:05]

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

[commit-bot: I haz the power, 2017-05-05 17:06:46]

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, 2017-05-05 17:31:25]

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

[commit-bot: I haz the power, 2017-05-05 17:31:26]

Dry run: Try jobs failed on following builders:
  android_n5x_swarming_rel on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_n5x_...)

[edwardjung, 2017-05-05 19:37:39]

> What's the crash look like?

This is the output from gdb:
https://paste.googleplex.com/4756837291261952

Seems to point to the metrics gathering:

MetricsHelper* ControllerClient::metrics_helper() const {
  return metrics_helper_.get();
}

SafeBrowsingLoudErrorUI::~SafeBrowsingLoudErrorUI() {
  controller()->metrics_helper()->RecordShutdownMetrics();
}

 
>
https://codereview.chromium.org/2852333003/diff/80001/components/safe_browsin...
> components/safe_browsing/base_blocking_page.cc:58:
> sb_error_ui_(base::MakeUnique<SafeBrowsingLoudErrorUI>(
> Is this where it's crashing?

Possibly

[edwardjung, 2017-05-07 13:49:50]

Spent more time trying to debug the crash and from the tests, example:

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Ftryserver.chromium.win%2...

and the output from gdb: https://paste.googleplex.com/4756837291261952

There's a problem with the destructor. I believe this stems from:

> components/safe_browsing/base_blocking_page.cc:58:
> sb_error_ui_(base::MakeUnique<SafeBrowsingLoudErrorUI>(

My lack of C++ experience is failing me here :(  anything I should try?

[Jialiu Lin, 2017-05-08 18:07:59]

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

[Jialiu Lin, 2017-05-08 18:08:00]

I'll patch your CL and give a try.

[Jialiu Lin, 2017-05-08 18:51:16]

Hi edwardjung,
All these crashes are caused by one minor problem. Please see my comment inline.


You also need to fix the compilation problem on Android caused by dependency
changes:

../../android_webview/browser/aw_safe_browsing_blocking_page.h:9:75: fatal
error: components/security_interstitials/core/safe_browsing_error_ui.h: No such
file or directory
 #include "components/security_interstitials/core/safe_browsing_error_ui.h"

Feel free to ping me if you have further questions.

https://codereview.chromium.org/2852333003/diff/100001/components/security_in...
File components/security_interstitials/core/base_safe_browsing_error_ui.cc
(right):

https://codereview.chromium.org/2852333003/diff/100001/components/security_in...
components/security_interstitials/core/base_safe_browsing_error_ui.cc:17: :
interstitial_reason_(std::move(reason)),
no need to use std::move() on interstitial_reasons_. it is a primitive type.

And no need to use std::move for display_options_ either, display_options is a
tiny object.

https://codereview.chromium.org/2852333003/diff/100001/components/security_in...
components/security_interstitials/core/base_safe_browsing_error_ui.cc:18:
display_options_(std::move(display_options)){};
request_url_, main_frame_url_, app_locale_, time_triggered_ and controller_ not
initialized in constructor. 


That's why crash happens wherever you call these uninitialized values.

[edwardjung, 2017-05-08 20:37:19]

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

[commit-bot: I haz the power, 2017-05-08 20:38:02]

Dry run: CQ is trying da patch.

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

[edwardjung, 2017-05-08 20:43:01]

@Jialiu, thanks for the pointers. As you've probably gathered C++ isn't my
primary language!

Crashes are resolved, so hopefully back on track.

@felt PTAL.

https://codereview.chromium.org/2852333003/diff/80001/chrome/browser/safe_bro...
File chrome/browser/safe_browsing/safe_browsing_blocking_page.cc (right):

https://codereview.chromium.org/2852333003/diff/80001/chrome/browser/safe_bro...
chrome/browser/safe_browsing/safe_browsing_blocking_page.cc:19: #include
"components/security_interstitials/core/safe_browsing_loud_error_ui.h"
On 2017/05/05 00:28:29, felt wrote:
> Is this the right include? Do you need an include for the base class here
> instead?

Removed.

https://codereview.chromium.org/2852333003/diff/80001/components/safe_browsin...
File components/safe_browsing/base_blocking_page.cc (right):

https://codereview.chromium.org/2852333003/diff/80001/components/safe_browsin...
components/safe_browsing/base_blocking_page.cc:15: #include
"components/security_interstitials/core/safe_browsing_loud_error_ui.h"
On 2017/05/05 00:28:29, felt wrote:
> include?

I need to include it as I'm using it below

https://codereview.chromium.org/2852333003/diff/100001/components/security_in...
File components/security_interstitials/core/base_safe_browsing_error_ui.cc
(right):

https://codereview.chromium.org/2852333003/diff/100001/components/security_in...
components/security_interstitials/core/base_safe_browsing_error_ui.cc:17: :
interstitial_reason_(std::move(reason)),
On 2017/05/08 18:51:16, Jialiu Lin wrote:
> no need to use std::move() on interstitial_reasons_. it is a primitive type.
> 
> And no need to use std::move for display_options_ either, display_options is a
> tiny object.

Done.

https://codereview.chromium.org/2852333003/diff/100001/components/security_in...
components/security_interstitials/core/base_safe_browsing_error_ui.cc:18:
display_options_(std::move(display_options)){};
On 2017/05/08 18:51:16, Jialiu Lin wrote:
> request_url_, main_frame_url_, app_locale_, time_triggered_ and controller_
not
> initialized in constructor. 
> 
> 
> That's why crash happens wherever you call these uninitialized values.

Done.

[felt, 2017-05-08 20:50:11]

lgtm % fix

https://codereview.chromium.org/2852333003/diff/120001/components/security_in...
File components/security_interstitials/core/safe_browsing_loud_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/120001/components/security_in...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:45: //
const GURL request_url_;
please remove the stuff you don't actually need here

[commit-bot: I haz the power, 2017-05-08 21:13:24]

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

[commit-bot: I haz the power, 2017-05-08 21:13:25]

Dry run: Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[edwardjung, 2017-05-08 22:32:53]

edwardjung@chromium.org changed reviewers:
+ michaelbai@chromium.org

[edwardjung, 2017-05-08 22:32:54]

@michaelbai PTAL at the following WV safebrowsing changes: 

android_webview/browser/aw_safe_browsing_blocking_page.h
android_webview/browser/aw_safe_browsing_blocking_page.cc

Thanks.

https://codereview.chromium.org/2852333003/diff/120001/components/security_in...
File components/security_interstitials/core/safe_browsing_loud_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/120001/components/security_in...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:45: //
const GURL request_url_;
On 2017/05/08 20:50:11, felt wrote:
> please remove the stuff you don't actually need here

Done.

[edwardjung, 2017-05-10 20:26:58]

@michaelbai ping!

[michaelbai, 2017-05-10 20:38:20]

android_webview LGTM

[edwardjung, 2017-05-10 21:07:41]

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

[commit-bot: I haz the power, 2017-05-10 21:09:16]

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, 2017-05-10 21:15:52]

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

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

Dry run: Try jobs failed on following builders:
  android_clang_dbg_recipe on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/android_clan...)
  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...)
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[edwardjung, 2017-05-11 10:57:27]

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

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

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, 2017-05-11 12:44:12]

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

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

Dry run: This issue passed the CQ dry run.

[edwardjung, 2017-05-11 13:05:37]

The CQ bit was checked by edwardjung@chromium.org

[edwardjung, 2017-05-11 13:05:38]

The patchset sent to the CQ was uploaded after l-g-t-m from felt@chromium.org,
michaelbai@chromium.org
Link to the patchset: https://codereview.chromium.org/2852333003/#ps180001
(title: "Fix merge conflict")

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

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-11 13:14:10]

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

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

Try jobs failed on following builders:
  chromium_presubmit on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presub...)

[edwardjung, 2017-05-11 13:21:53]

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

[edwardjung, 2017-05-11 13:21:53]

@nparker PTAL at:
c/b/safe_browsing/*

@jialiul for these files:
components/safe_browsing/base_blocking_page.*

[Jialiu Lin, 2017-05-11 17:08:03]

LGTM for both components/safe_browsing and chrome/browser/safe_browsing

[edwardjung, 2017-05-12 16:58:43]

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

[commit-bot: I haz the power, 2017-05-12 16:59:27]

Dry run: CQ is trying da patch.

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

[Nathan Parker, 2017-05-12 17:02:47]

LGTM % small nits

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
File components/security_interstitials/core/base_safe_browsing_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
components/security_interstitials/core/base_safe_browsing_error_ui.h:18: // to
determine what type of error should be displayed when.
Maybe add a comment describing the intention for this class -- as a base class
for the Loud vs Quiet interstitials

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
File components/security_interstitials/core/safe_browsing_loud_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:19: // to
determine what type of error should be displayed when.
Add a comment as to what "Loud" means (big red interstitial that's fully
interactive, and is used on desktop/android but only parts of WebView)

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:34: void
PopulateStringsForHTML(base::DictionaryValue* load_time_data) override;
// Implement BaseSafeBrowsingErrorUI

[edwardjung, 2017-05-12 17:45:54]

Thanks Nathan.

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
File components/security_interstitials/core/base_safe_browsing_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
components/security_interstitials/core/base_safe_browsing_error_ui.h:18: // to
determine what type of error should be displayed when.
On 2017/05/12 17:02:47, Nathan Parker wrote:
> Maybe add a comment describing the intention for this class -- as a base class
> for the Loud vs Quiet interstitials

Done.

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
File components/security_interstitials/core/safe_browsing_loud_error_ui.h
(right):

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:19: // to
determine what type of error should be displayed when.
On 2017/05/12 17:02:47, Nathan Parker wrote:
> Add a comment as to what "Loud" means (big red interstitial that's fully
> interactive, and is used on desktop/android but only parts of WebView)

Done.

https://codereview.chromium.org/2852333003/diff/180001/components/security_in...
components/security_interstitials/core/safe_browsing_loud_error_ui.h:34: void
PopulateStringsForHTML(base::DictionaryValue* load_time_data) override;
On 2017/05/12 17:02:47, Nathan Parker wrote:
> // Implement BaseSafeBrowsingErrorUI

Done.

[edwardjung, 2017-05-12 17:46:07]

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

[commit-bot: I haz the power, 2017-05-12 17:47:18]

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, 2017-05-12 20:27:28]

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

[commit-bot: I haz the power, 2017-05-12 20:27:29]

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

[edwardjung, 2017-05-12 22:46:56]

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

[commit-bot: I haz the power, 2017-05-12 22:47:42]

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, 2017-05-12 22:56:56]

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

[commit-bot: I haz the power, 2017-05-12 22:56:58]

Dry run: This issue passed the CQ dry run.

[edwardjung, 2017-05-12 23:00:49]

The CQ bit was checked by edwardjung@chromium.org

[edwardjung, 2017-05-12 23:00:50]

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

[commit-bot: I haz the power, 2017-05-12 23:02:59]

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-12 23:13:33]

CQ is committing da patch.

Bot data: {"patchset_id": 220001, "attempt_start_ts": 1494630049979980,
"parent_rev": "942998b3db2c227e559abe439b2cc4ce16567673", "commit_rev":
"d7395fb0478f05e183d9aa649ef72e859987c84f"}

[commit-bot: I haz the power, 2017-05-12 23:13:44]

Description was changed from

==========
Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

In preparation for adding a 'quiet' version of the Safe Browsing interstitial
UI.

BUG=716096
==========

to

==========
Rename SafeBrowsingErrorUI to SafeBrowsingLoudErrorUI

In preparation for adding a 'quiet' version of the Safe Browsing interstitial
UI.

BUG=716096

Review-Url: https://codereview.chromium.org/2852333003
Cr-Commit-Position: refs/heads/master@{#471479}
Committed:
https://chromium.googlesource.com/chromium/src/+/d7395fb0478f05e183d9aa649ef7...
==========

[commit-bot: I haz the power, 2017-05-12 23:13:45]

Committed patchset #12 (id:220001) as
https://chromium.googlesource.com/chromium/src/+/d7395fb0478f05e183d9aa649ef7...