Allow component-updated Flash to override the placeholder fake Flash even if

Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323
Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Committed: https://crrev.com/df37d85863495afc85ba5f0d429fca1d0643eb62
Cr-Original-Commit-Position: refs/heads/master@{#415781}
Cr-Commit-Position: refs/heads/master@{#415811}

[waffles, 2016-08-31 18:55:43]

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

[commit-bot: I haz the power, 2016-08-31 18:56:08]

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

[waffles, 2016-08-31 18:56:42]

waffles@chromium.org changed reviewers:
+ wfh@chromium.org

[waffles, 2016-08-31 18:56:43]

Will, PTAL. This fixes Flash on Chrome Canary.

[waffles, 2016-08-31 19:02:43]

On 2016/08/31 18:56:43, waffles wrote:
> Will, PTAL. This fixes Flash on Chrome Canary.

(Trying to get my Win internal checkout set up so I can actually test this -
won't CQ before then.)

[Will Harris, 2016-08-31 19:29:36]

how would this ever happen? the placeholder fake flash plugin is FLAPPER_VERSION
which should always be lower than the component updated version...

[waffles, 2016-08-31 19:32:10]

On 2016/08/31 19:29:36, Will Harris wrote:
> how would this ever happen? the placeholder fake flash plugin is
FLAPPER_VERSION
> which should always be lower than the component updated version...

That is what I thought, too, but: at the moment, FLAPPER_VERSION for Canary is
23.0.0.151, but we're component-updating to 22.0.0.209, because there is a
problem with the 23.0.0.151 manifest.json (it always claims to be 32-bit, even
with a 64-bit DLL).

[Will Harris, 2016-08-31 19:38:46]

lgtm but this seems to be getting messier than originally planned...

https://codereview.chromium.org/2298343002/diff/1/chrome/browser/component_up...
File chrome/browser/component_updater/pepper_flash_component_installer.cc
(right):

https://codereview.chromium.org/2298343002/diff/1/chrome/browser/component_up...
chrome/browser/component_updater/pepper_flash_component_installer.cc:125: if
(plugin.path == placeholder_path) {
nit: move above line 123

[commit-bot: I haz the power, 2016-08-31 19:50:00]

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

[commit-bot: I haz the power, 2016-08-31 19:50:00]

Dry run: This issue passed the CQ dry run.

[waffles, 2016-08-31 19:55:00]

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

[commit-bot: I haz the power, 2016-08-31 19:55:44]

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

[waffles, 2016-08-31 20:00:03]

https://codereview.chromium.org/2298343002/diff/1/chrome/browser/component_up...
File chrome/browser/component_updater/pepper_flash_component_installer.cc
(right):

https://codereview.chromium.org/2298343002/diff/1/chrome/browser/component_up...
chrome/browser/component_updater/pepper_flash_component_installer.cc:125: if
(plugin.path == placeholder_path) {
On 2016/08/31 19:38:46, Will Harris wrote:
> nit: move above line 123

Done.

[commit-bot: I haz the power, 2016-08-31 20:51:22]

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

[commit-bot: I haz the power, 2016-08-31 20:51:23]

Dry run: This issue passed the CQ dry run.

[waffles, 2016-08-31 22:17:54]

> (Trying to get my Win internal checkout set up so I can actually test this -
> won't CQ before then.)

Verified working on Win.

[waffles, 2016-08-31 22:18:01]

The CQ bit was checked by waffles@chromium.org

[waffles, 2016-08-31 22:18:01]

The patchset sent to the CQ was uploaded after l-g-t-m from wfh@chromium.org
Link to the patchset: https://codereview.chromium.org/2298343002/#ps20001
(title: "Through LGTM")

[commit-bot: I haz the power, 2016-08-31 22:18:45]

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-31 22:24:27]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-08-31 22:27:14]

Description was changed from

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323
==========

to

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}
==========

[commit-bot: I haz the power, 2016-08-31 22:27:15]

Patchset 2 (id:??) landed as
https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}

[fgorski, 2016-08-31 23:06:02]

A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/2300883002/ by fgorski@chromium.org.

The reason for reverting is: missing ;.

[waffles, 2016-08-31 23:14:57]

On 2016/08/31 23:06:02, fgorski wrote:
> A revert of this CL (patchset #2 id:20001) has been created in
> https://codereview.chromium.org/2300883002/ by mailto:fgorski@chromium.org.
> 
> The reason for reverting is: missing ;.

(Duh. I forgot to upload the patchset that had that fix.)

[waffles, 2016-08-31 23:15:22]

Description was changed from

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}
==========

to

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}
==========

[waffles, 2016-08-31 23:15:33]

The CQ bit was checked by waffles@chromium.org

[waffles, 2016-08-31 23:15:34]

The patchset sent to the CQ was uploaded after l-g-t-m from wfh@chromium.org
Link to the patchset: https://codereview.chromium.org/2298343002/#ps40001
(title: "Missing ;")

[commit-bot: I haz the power, 2016-08-31 23:16: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-31 23:57:18]

Description was changed from

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}
==========

to

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}
==========

[commit-bot: I haz the power, 2016-08-31 23:57:19]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-09-01 00:03:33]

Description was changed from

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Cr-Commit-Position: refs/heads/master@{#415781}
==========

to

==========
Allow component-updated Flash to override the placeholder fake Flash even if
the version is lower.

BUG=642323

Committed: https://crrev.com/30f12cd92e58dddfd196e72356aea5abefacaf4d
Committed: https://crrev.com/df37d85863495afc85ba5f0d429fca1d0643eb62
Cr-Original-Commit-Position: refs/heads/master@{#415781}
Cr-Commit-Position: refs/heads/master@{#415811}
==========

[commit-bot: I haz the power, 2016-09-01 00:03:34]

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