Send metrics with embedded system profiles after system startup.

Persistent metrics files that have an embedded profile don't need to
be sent during startup.  Instead, send them as independent logs
once the browser is already running.

BUG=695880
Review-Url: https://codereview.chromium.org/2918533003
Cr-Commit-Position: refs/heads/master@{#478359}
Committed: https://chromium.googlesource.com/chromium/src/+/8e72aa59dfdea6e261b06d8061e488f76801898f

[bcwhite, 2017-05-31 14:24:01]

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

[commit-bot: I haz the power, 2017-05-31 14:24:14]

Dry run: CQ is trying da patch.

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

[bcwhite, 2017-05-31 14:24:58]

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

[commit-bot: I haz the power, 2017-05-31 15:33:27]

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

[commit-bot: I haz the power, 2017-05-31 15:33:28]

Dry run: This issue passed the CQ dry run.

[bcwhite, 2017-05-31 17:08:57]

The CQ bit was checked by bcwhite@chromium.org

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

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-31 17:09:20]

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

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

No L-G-T-M from a valid reviewer yet.
CQ run can only be started once the patch has received an L-G-T-M from a full
committer.
Even if an L-G-T-M may have been provided, it was from a non-committer,_not_ a
full super star committer.
Committers are members of the group "project-chromium-committers".
Note that this has nothing to do with OWNERS files.

[bcwhite, 2017-05-31 18:36:31]

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

[commit-bot: I haz the power, 2017-05-31 18:37:38]

Dry run: CQ is trying da patch.

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

[Alexei Svitkine (slow), 2017-05-31 20:31:24]

https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
File components/metrics/metrics_service.cc (right):

https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
components/metrics/metrics_service.cc:788: provider.get(),
&system_profile_app_version)) {
Instead of replacing the profile of the stability log, can we generate a
separate log from each persistent file that has a system profile?

Otherwise if we have a scenario of:
  1. Session A crash
  2. Session B crash
  3. Session C OK

With your current CL, we will group stability stats + metrics from A and B with
one of the profiles of A or B - but that will not be correct for some of the
metrics in that report.

Instead, we should have:
  persistent histogram from A reported separately with its embedded profile
  persistent histogram from B reported separately with its embedded profile
  stability log just containing the non-persistent stuff with the system profile
from local state

[bcwhite, 2017-05-31 20:48:30]

https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
File components/metrics/metrics_service.cc (right):

https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
components/metrics/metrics_service.cc:788: provider.get(),
&system_profile_app_version)) {
Currently there is only ever one persistent histogram file and it's always for
the previous run so this scenario doesn't occur.  There are also other metrics
files (like from Startup and Crashpad) that don't have an embedded profile so
they can't be reported independently.

But generally I agree with you.  I'd like to get the system profile into every
persistent file and then move the reporting completely out to a separate task
that can be run sometime after startup or even by an outside process such as
Omaha.

Is this acceptable as a step along that path?

[commit-bot: I haz the power, 2017-05-31 20:57:48]

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

[commit-bot: I haz the power, 2017-05-31 20:57:49]

Dry run: This issue passed the CQ dry run.

[Alexei Svitkine (slow), 2017-06-01 15:00:29]

https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
File components/metrics/metrics_service.cc (right):

https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
components/metrics/metrics_service.cc:788: provider.get(),
&system_profile_app_version)) {
On 2017/05/31 20:48:29, bcwhite wrote:
> Currently there is only ever one persistent histogram file and it's always for
> the previous run so this scenario doesn't occur.  There are also other metrics
> files (like from Startup and Crashpad) that don't have an embedded profile so
> they can't be reported independently.
> 
> But generally I agree with you.  I'd like to get the system profile into every
> persistent file and then move the reporting completely out to a separate task
> that can be run sometime after startup or even by an outside process such as
> Omaha.
> 
> Is this acceptable as a step along that path?

Per offline discussion, I prefer to not have this intermediate step - as this
may report the stability metrics with the persistent histogram's system proto -
which can also be wrong. Let's just do the final solution.

[bcwhite, 2017-06-07 20:15:48]

Description was changed from

==========
Recover system profile from persistent storage during stability metrics upload.

BUG=695880
==========

to

==========
Persistent metrics files that have an embedded profile don't need to
be sent during startup.  Instead, send them as independent logs
once the browser is already running.

BUG=695880
==========

[bcwhite, 2017-06-07 20:16:04]

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

[commit-bot: I haz the power, 2017-06-07 20:16:38]

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-06-07 20:26:36]

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

[commit-bot: I haz the power, 2017-06-07 20:26:38]

Dry run: Try jobs failed on following builders:
  linux_chromium_headless_rel on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)
  ios-simulator on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator/bui...)

[bcwhite, 2017-06-07 21:01:45]

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

[bcwhite, 2017-06-07 21:02:02]

Patchset #3 (id:40001) has been deleted

[commit-bot: I haz the power, 2017-06-07 21:05:30]

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-06-07 21:06:05]

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

[commit-bot: I haz the power, 2017-06-07 21:06:06]

Dry run: CQ cannot get SignCLA result. Please try later.

[bcwhite, 2017-06-07 21:18:38]

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

[commit-bot: I haz the power, 2017-06-07 21:19:20]

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-06-07 21:35:36]

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

[commit-bot: I haz the power, 2017-06-07 21:35:37]

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

[bcwhite, 2017-06-07 22:34:28]

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

[commit-bot: I haz the power, 2017-06-07 22:34:58]

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-06-07 22:59:20]

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

[commit-bot: I haz the power, 2017-06-07 22:59:20]

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_...)

[bcwhite, 2017-06-08 16:30:04]

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

[commit-bot: I haz the power, 2017-06-08 16:30:25]

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-06-08 16:58:32]

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

[commit-bot: I haz the power, 2017-06-08 16:58:33]

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

[bcwhite, 2017-06-08 17:10:01]

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

[bcwhite, 2017-06-08 17:10:12]

Patchset #4 (id:80001) has been deleted

[commit-bot: I haz the power, 2017-06-08 17:10:31]

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-06-08 18:21:44]

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

[commit-bot: I haz the power, 2017-06-08 18:21:46]

Dry run: This issue passed the CQ dry run.

[bcwhite, 2017-06-08 18:28:15]

On 2017/06/01 15:00:29, Alexei Svitkine (very slow) wrote:
>
https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
> File components/metrics/metrics_service.cc (right):
> 
>
https://codereview.chromium.org/2918533003/diff/20001/components/metrics/metr...
> components/metrics/metrics_service.cc:788: provider.get(),
> &system_profile_app_version)) {
> On 2017/05/31 20:48:29, bcwhite wrote:
> > Currently there is only ever one persistent histogram file and it's always
for
> > the previous run so this scenario doesn't occur.  There are also other
metrics
> > files (like from Startup and Crashpad) that don't have an embedded profile
so
> > they can't be reported independently.
> > 
> > But generally I agree with you.  I'd like to get the system profile into
every
> > persistent file and then move the reporting completely out to a separate
task
> > that can be run sometime after startup or even by an outside process such as
> > Omaha.
> > 
> > Is this acceptable as a step along that path?
> 
> Per offline discussion, I prefer to not have this intermediate step - as this
> may report the stability metrics with the persistent histogram's system proto
-
> which can also be wrong. Let's just do the final solution.

Done.  PTAL.

[Alexei Svitkine (slow), 2017-06-08 23:59:31]

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
File components/metrics/metrics_log.cc (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_log.cc:57: class IndependentFlattener : public
base::HistogramFlattener {
Nit: Short comment please

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_log.cc:59: IndependentFlattener(MetricsLog* log) :
log_(log) {}
explicit

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_log.cc:74: };
Nit: DISALLOW

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
File components/metrics/metrics_service.cc (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:629:
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
Please use the new post task APIs in base please.

i.e. base::PostDelayedTaskWithTraits

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:980: bool
MetricsService::RecordIndependentHistogramLog() {
Nit: Add thread_checker_ tests here and below.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:981: std::unique_ptr<MetricsLog> log =
CreateLog(MetricsLog::INDEPENDENT_LOG);
CreateLog() uses session_id_ but this is not correct since it's not from the
current session. But I guess this is OK because we actually end up using the
system profile from the provider? If so, maybe add a comment.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:1000: base::TimeDelta::FromSeconds(found ?
5 : 900));
Nit: instead FromMinutes(15) and move the found to outside the call.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
File components/metrics/metrics_service.h (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.h:359: bool RecordIndependentHistogramLog();
Nit: I find the names not very clear. First, I suggest using the "Prepare"
terminology to match PrepareInitialStabilityLog(). "Record" is usually used when
we record metrics (i.e. functions that have histogram macros in them).

Also, I think mentioning that this is from the providers in the name would be
good. e.g. PrepareProviderMetricsLog().

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.h:363: void RecordIndependentHistogramJob();
Nit: Job -> Task, so with the above suggestion PrepareProviderMetricsLogTask().

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/per...
File components/metrics/persistent_system_profile_unittest.cc (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/per...
components/metrics/persistent_system_profile_unittest.cc:94:
persistent_profile()->SetSystemProfile(proto1);
Nit: Name the new function that takes the proto SetSystemProfileProto().

[bcwhite, 2017-06-09 14:25:42]

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

[commit-bot: I haz the power, 2017-06-09 14:25:54]

Dry run: CQ is trying da patch.

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

[bcwhite, 2017-06-09 14:57:56]

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

[bcwhite, 2017-06-09 14:58:12]

Patchset #5 (id:120001) has been deleted

[commit-bot: I haz the power, 2017-06-09 14:58:13]

Dry run: CQ is trying da patch.

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

[bcwhite, 2017-06-09 14:58:28]

Patchset #5 (id:120001) has been deleted

[bcwhite, 2017-06-09 15:09:28]

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
File components/metrics/metrics_log.cc (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_log.cc:57: class IndependentFlattener : public
base::HistogramFlattener {
On 2017/06/08 23:59:30, Alexei Svitkine (very slow) wrote:
> Nit: Short comment please

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_log.cc:59: IndependentFlattener(MetricsLog* log) :
log_(log) {}
On 2017/06/08 23:59:30, Alexei Svitkine (very slow) wrote:
> explicit

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_log.cc:74: };
On 2017/06/08 23:59:30, Alexei Svitkine (very slow) wrote:
> Nit: DISALLOW

I always forget that!
Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
File components/metrics/metrics_service.cc (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:629:
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
On 2017/06/08 23:59:30, Alexei Svitkine (very slow) wrote:
> Please use the new post task APIs in base please.
> 
> i.e. base::PostDelayedTaskWithTraits

That API runs tasks on threads it owns rather than the main thread.  This has to
be done on the main thread.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:980: bool
MetricsService::RecordIndependentHistogramLog() {
On 2017/06/08 23:59:30, Alexei Svitkine (very slow) wrote:
> Nit: Add thread_checker_ tests here and below.

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:981: std::unique_ptr<MetricsLog> log =
CreateLog(MetricsLog::INDEPENDENT_LOG);
On 2017/06/08 23:59:31, Alexei Svitkine (very slow) wrote:
> CreateLog() uses session_id_ but this is not correct since it's not from the
> current session. But I guess this is OK because we actually end up using the
> system profile from the provider? If so, maybe add a comment.

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.cc:1000: base::TimeDelta::FromSeconds(found ?
5 : 900));
On 2017/06/08 23:59:30, Alexei Svitkine (very slow) wrote:
> Nit: instead FromMinutes(15) and move the found to outside the call.

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
File components/metrics/metrics_service.h (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.h:359: bool RecordIndependentHistogramLog();
On 2017/06/08 23:59:31, Alexei Svitkine (very slow) wrote:
> Nit: I find the names not very clear. First, I suggest using the "Prepare"
> terminology to match PrepareInitialStabilityLog(). "Record" is usually used
when
> we record metrics (i.e. functions that have histogram macros in them).
> 
> Also, I think mentioning that this is from the providers in the name would be
> good. e.g. PrepareProviderMetricsLog().

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/met...
components/metrics/metrics_service.h:363: void RecordIndependentHistogramJob();
On 2017/06/08 23:59:31, Alexei Svitkine (very slow) wrote:
> Nit: Job -> Task, so with the above suggestion
PrepareProviderMetricsLogTask().

Done.

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/per...
File components/metrics/persistent_system_profile_unittest.cc (right):

https://codereview.chromium.org/2918533003/diff/100001/components/metrics/per...
components/metrics/persistent_system_profile_unittest.cc:94:
persistent_profile()->SetSystemProfile(proto1);
On 2017/06/08 23:59:31, Alexei Svitkine (very slow) wrote:
> Nit: Name the new function that takes the proto SetSystemProfileProto().

It's setting a "profile", not a "profile proto" so I don't think the method name
should change.  It's describing what its doing, not what the parameter is.  The
overloaded nature just allows multiple ways of doing the same thing based on the
source information available.

[Alexei Svitkine (slow), 2017-06-09 16:08:33]

lgtm

https://codereview.chromium.org/2918533003/diff/140001/chrome/browser/metrics...
File chrome/browser/metrics/chrome_metrics_service_client.cc (right):

https://codereview.chromium.org/2918533003/diff/140001/chrome/browser/metrics...
chrome/browser/metrics/chrome_metrics_service_client.cc:195:
ASSOCIATE_INTERNAL_PROFILE_OR_PREVIOUS_RUN,
Nit: Maybe just pass the enum to the function directly.

https://codereview.chromium.org/2918533003/diff/140001/components/metrics/fil...
File components/metrics/file_metrics_provider.cc (right):

https://codereview.chromium.org/2918533003/diff/140001/components/metrics/fil...
components/metrics/file_metrics_provider.cc:311: // Metrics associted with
internal profiles have to be fetched directly
associated

https://codereview.chromium.org/2918533003/diff/140001/components/metrics/fil...
components/metrics/file_metrics_provider.cc:536: while (true) {
Why not:

while (!source_with_profile_.empty()) {
}
return false;

If there's success on line 560, it will still return true but otherwise I think
it should be the same logic but without the weird looking while true.

[commit-bot: I haz the power, 2017-06-09 16:27:38]

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

[commit-bot: I haz the power, 2017-06-09 16:27:39]

Dry run: This issue passed the CQ dry run.

[bcwhite, 2017-06-09 16:47:03]

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

[commit-bot: I haz the power, 2017-06-09 16:47:24]

Dry run: CQ is trying da patch.

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

[bcwhite, 2017-06-09 16:59:10]

https://codereview.chromium.org/2918533003/diff/140001/chrome/browser/metrics...
File chrome/browser/metrics/chrome_metrics_service_client.cc (right):

https://codereview.chromium.org/2918533003/diff/140001/chrome/browser/metrics...
chrome/browser/metrics/chrome_metrics_service_client.cc:195:
ASSOCIATE_INTERNAL_PROFILE_OR_PREVIOUS_RUN,
On 2017/06/09 16:08:33, Alexei Svitkine (very slow) wrote:
> Nit: Maybe just pass the enum to the function directly.

Done.

https://codereview.chromium.org/2918533003/diff/140001/components/metrics/fil...
File components/metrics/file_metrics_provider.cc (right):

https://codereview.chromium.org/2918533003/diff/140001/components/metrics/fil...
components/metrics/file_metrics_provider.cc:311: // Metrics associted with
internal profiles have to be fetched directly
On 2017/06/09 16:08:33, Alexei Svitkine (very slow) wrote:
> associated

Done.

https://codereview.chromium.org/2918533003/diff/140001/components/metrics/fil...
components/metrics/file_metrics_provider.cc:536: while (true) {
On 2017/06/09 16:08:33, Alexei Svitkine (very slow) wrote:
> Why not:
> 
> while (!source_with_profile_.empty()) {
> }
> return false;
> 
> If there's success on line 560, it will still return true but otherwise I
think
> it should be the same logic but without the weird looking while true.

Done.

[commit-bot: I haz the power, 2017-06-09 18:22:20]

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

[commit-bot: I haz the power, 2017-06-09 18:22:21]

Dry run: This issue passed the CQ dry run.

[bcwhite, 2017-06-09 18:54:43]

The CQ bit was checked by bcwhite@chromium.org

[bcwhite, 2017-06-09 18:54:44]

The patchset sent to the CQ was uploaded after l-g-t-m from
asvitkine@chromium.org
Link to the patchset: https://codereview.chromium.org/2918533003/#ps160001
(title: "addressed final review comments")

[commit-bot: I haz the power, 2017-06-09 18:55:04]

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-06-09 18:59:20]

CQ is committing da patch.

Bot data: {"patchset_id": 160001, "attempt_start_ts": 1497034483621410,
"parent_rev": "65ea13c8754c8092a65e88d1f3874a3bc42f6966", "commit_rev":
"8e72aa59dfdea6e261b06d8061e488f76801898f"}

[commit-bot: I haz the power, 2017-06-09 18:59:34]

Description was changed from

==========
Persistent metrics files that have an embedded profile don't need to
be sent during startup.  Instead, send them as independent logs
once the browser is already running.

BUG=695880
==========

to

==========
Persistent metrics files that have an embedded profile don't need to
be sent during startup.  Instead, send them as independent logs
once the browser is already running.

BUG=695880

Review-Url: https://codereview.chromium.org/2918533003
Cr-Commit-Position: refs/heads/master@{#478359}
Committed:
https://chromium.googlesource.com/chromium/src/+/8e72aa59dfdea6e261b06d8061e4...
==========

[commit-bot: I haz the power, 2017-06-09 18:59:35]

Committed patchset #6 (id:160001) as
https://chromium.googlesource.com/chromium/src/+/8e72aa59dfdea6e261b06d8061e4...