Use bundled Pepper Flash on Windows (Canary, still on a field trial).

Use bundled Pepper Flash on Windows (Canary, still on a field trial).

First committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=133472
(was reverted, due to missing SHARED_INTERMEDIATE_DIR include dir in chrome_browser.gypi)

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=133594

[yzshen1, 2012-04-19 18:33:09]

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/chrome_c...
File chrome/common/chrome_content_client.cc (right):

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/chrome_c...
chrome/common/chrome_content_client.cc:228:
switches::kDisableBundledPpapiFlash);
should be 8 space indent (from the beginning of the line).

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/pepper_f...
File chrome/common/pepper_flash.cc (right):

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/pepper_f...
chrome/common/pepper_flash.cc:8: #include "base/command_line.h"
remove this duplicate.

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/pepper_f...
chrome/common/pepper_flash.cc:76: return true;
This return true should be removed.

[cpu_(ooo_6.6-7.5), 2012-04-19 19:58:43]

I think you need a content owner?

[viettrungluu, 2012-04-19 20:23:16]

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/chrome_c...
File chrome/common/chrome_content_client.cc (right):

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/chrome_c...
chrome/common/chrome_content_client.cc:228:
switches::kDisableBundledPpapiFlash);
On 2012/04/19 18:33:09, yzshen1 wrote:
> should be 8 space indent (from the beginning of the line).

It's a 4-space continuation indent from being aligned after the |&=|.

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/pepper_f...
File chrome/common/pepper_flash.cc (right):

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/pepper_f...
chrome/common/pepper_flash.cc:8: #include "base/command_line.h"
On 2012/04/19 18:33:09, yzshen1 wrote:
> remove this duplicate.

Done.

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/pepper_f...
chrome/common/pepper_flash.cc:76: return true;
On 2012/04/19 18:33:09, yzshen1 wrote:
> This return true should be removed.

Oops! Done.

[viettrungluu, 2012-04-19 20:24:47]

On 2012/04/19 19:58:43, cpu wrote:
> I think you need a content owner?

There are no changes to content. But I'll add brettw for blanket chrome
coverage. Or something like that.

[viettrungluu, 2012-04-19 20:25:12]

+brettw for OWNERS review, or something

[yzshen1, 2012-04-19 20:27:49]

lgtm

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/chrome_c...
File chrome/common/chrome_content_client.cc (right):

https://chromiumcodereview.appspot.com/10123016/diff/1/chrome/common/chrome_c...
chrome/common/chrome_content_client.cc:228:
switches::kDisableBundledPpapiFlash);
But it is not consistent with line 221.
I don't think it is important, though.

On 2012/04/19 20:23:16, viettrungluu wrote:
> On 2012/04/19 18:33:09, yzshen1 wrote:
> > should be 8 space indent (from the beginning of the line).
> 
> It's a 4-space continuation indent from being aligned after the |&=|.

[viettrungluu, 2012-04-20 17:51:43]

@cpu: Did you want to actually look at this?

[cpu_(ooo_6.6-7.5), 2012-04-20 20:35:31]

lgtm.

sorry for the delay. I was ooo

[commit-bot: I haz the power, 2012-04-20 22:50:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/viettrungluu@chromium.org/10123016/10001

[commit-bot: I haz the power, 2012-04-21 02:55:51]

Try job failure for 10123016-10001 (retry) on win_rel for step "browser_tests".
It's a second try, previously, step "browser_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2012-04-23 16:19:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/viettrungluu@chromium.org/10123016/10001

[commit-bot: I haz the power, 2012-04-23 17:50:46]

Change committed as 133472

[commit-bot: I haz the power, 2012-04-23 21:41:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/viettrungluu@chromium.org/10123016/29001

[commit-bot: I haz the power, 2012-04-23 21:41:48]

Can't apply patch for file chrome/chrome_browser.gypi.
While running patch -p1 --forward --force;
patching file chrome/chrome_browser.gypi
Hunk #1 FAILED at 40.
Hunk #2 succeeded at 69 (offset -1 lines).
Hunk #3 succeeded at 871 (offset 3 lines).
1 out of 3 hunks FAILED -- saving rejects to file chrome/chrome_browser.gypi.rej

[commit-bot: I haz the power, 2012-04-23 23:49:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/viettrungluu@chromium.org/10123016/37001

[commit-bot: I haz the power, 2012-04-24 01:43:09]

Change committed as 133594