Fix bug with 'not' flags in _FormatSource()

Fix bug with 'not' flags in _FormatSource()

BUG=628086
TEST=See bug, check that logo has reappeared.  Alternately, run in debug
mode and observe that program doesn't crash at startup.

Committed: https://crrev.com/1be5656fff449c3d2ad654c21fb33df30e4becea
Cr-Commit-Position: refs/heads/master@{#405892}

[Greg Levin, 2016-07-15 17:54:27]

glevin@chromium.org changed reviewers:
+ thestig@chromium.org

[Greg Levin, 2016-07-15 17:54:28]

Hey thestig@.  Could you take a look at this?  This appears to fix things, but I
don't know if it's the best possible fix.

The bug was caused indirectly by this change:

https://codereview.chromium.org/2138583002/diff/20001/components/resources/co...

The cause was

  {"IDR_PRODUCT_LOGO", IDR_PRODUCT_LOGO},

not being added to components_scaled_resources_map.cc:
https://cs.chromium.org/chromium/src/out/Debug/gen/components/grit/components...

It was working on chromium, but not google branded.  I discovered that switching
the blocks in version_ui_scaled_resources.grdp fixed chrome version, but broke
chromium:

https://cs.chromium.org/chromium/src/components/resources/version_ui_scaled_r...

I tracked this down to resource_map.py.  Best I can tell, "seen.add(key)" would
add IDR_PRODUCT_LOGO after reading the first block, and then prematurely skip
the second block, even when it was the valid one.  I believe this was also
causing some IDRs from omnibox_scaled_resources.grdp to not be included:

https://cs.chromium.org/chromium/src/components/resources/omnibox_scaled_reso...

Anyway, this CL seems to fix things, but there may be a better approach, given
that I don't know anything about grit, or really even know python :-)

[Lei Zhang, 2016-07-15 19:42:39]

Thanks for tracking this down. Will take a look in a bit. I'm not 100% familiar
with grit internals, so need a little time. Apoligies for the trouble, but I'm
glad output_all_resource_defines=false is shaking out all the bugs.

[Lei Zhang, 2016-07-15 21:41:06]

lgtm, thanks again. I'll look into writing a grit unit test.

https://codereview.chromium.org/2149233005/diff/1/tools/grit/grit/format/reso...
File tools/grit/grit/format/resource_map.py (right):

https://codereview.chromium.org/2149233005/diff/1/tools/grit/grit/format/reso...
tools/grit/grit/format/resource_map.py:126: seen.add(key)
Put this above the yield.

[Greg Levin, 2016-07-15 22:28:53]

The CQ bit was checked by glevin@chromium.org

[Greg Levin, 2016-07-15 22:28:54]

The patchset sent to the CQ was uploaded after l-g-t-m from thestig@chromium.org
Link to the patchset: https://codereview.chromium.org/2149233005/#ps20001
(title: "Move line as per review")

[Greg Levin, 2016-07-15 22:29:10]

https://codereview.chromium.org/2149233005/diff/1/tools/grit/grit/format/reso...
File tools/grit/grit/format/resource_map.py (right):

https://codereview.chromium.org/2149233005/diff/1/tools/grit/grit/format/reso...
tools/grit/grit/format/resource_map.py:126: seen.add(key)
On 2016/07/15 21:41:06, Lei Zhang wrote:
> Put this above the yield.

Done.

[commit-bot: I haz the power, 2016-07-15 22:29:26]

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-07-15 23:10:29]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-07-15 23:10:40]

CQ bit was unchecked.

[commit-bot: I haz the power, 2016-07-15 23:12:19]

Description was changed from

==========
Fix bug with 'not' flags in _FormatSource()

BUG=628086
TEST=See bug, check that logo has reappeared.  Alternately, run in debug
mode and observe that program doesn't crash at startup.
==========

to

==========
Fix bug with 'not' flags in _FormatSource()

BUG=628086
TEST=See bug, check that logo has reappeared.  Alternately, run in debug
mode and observe that program doesn't crash at startup.

Committed: https://crrev.com/1be5656fff449c3d2ad654c21fb33df30e4becea
Cr-Commit-Position: refs/heads/master@{#405892}
==========

[commit-bot: I haz the power, 2016-07-15 23:12:19]

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