Protobuf: Cherry-pick upstream r427.

Protobuf: Cherry-pick upstream r427.

Use string::size_type instead of int for results of
string::find_first_of().

BUG=151927
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=159466

[hans, 2012-10-01 08:21:13]

Talking to Philippe, we agreed that this should be cherry-picked until we can do
the real roll, which might take a while.

Protobuf released a new version, so rolling forward from r423 is a pretty big
deal with a huge amounts of changes and conflicts.

[Nico, 2012-10-01 08:25:21]

lgtm!

[commit-bot: I haz the power, 2012-10-01 08:26:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hans@chromium.org/11012009/1

[commit-bot: I haz the power, 2012-10-01 08:30:13]

Retried try job too often for step(s) crypto_unittests, unit_tests,
cacheinvalidation_unittests, remoting_unittests, jingle_unittests,
nacl_integration, ipc_tests, interactive_ui_tests, browser_tests, net_unittests,
content_unittests, gpu_unittests, base_unittests, sync_integration_tests,
media_unittests, safe_browsing_tests, content_browsertests, sql_unittests,
printing_unittests, sync_unit_tests, check_deps

[Philippe, 2012-10-01 16:48:39]

On 2012/10/01 08:30:13, I haz the power (commit-bot) wrote:
> Retried try job too often for step(s) crypto_unittests, unit_tests,
> cacheinvalidation_unittests, remoting_unittests, jingle_unittests,
> nacl_integration, ipc_tests, interactive_ui_tests, browser_tests,
net_unittests,
> content_unittests, gpu_unittests, base_unittests, sync_integration_tests,
> media_unittests, safe_browsing_tests, content_browsertests, sql_unittests,
> printing_unittests, sync_unit_tests, check_deps

LGTM.

Thanks Hans. I'm working on the roll in parallel which is non-trivial this time.

Nico, do you know if the local changes we have in Chromium's protobuf could be
upstreamed so that we could use DEPS to do the rolls?

[Nico, 2012-10-02 01:10:32]

On 2012/10/01 16:48:39, Philippe wrote:
> On 2012/10/01 08:30:13, I haz the power (commit-bot) wrote:
> > Retried try job too often for step(s) crypto_unittests, unit_tests,
> > cacheinvalidation_unittests, remoting_unittests, jingle_unittests,
> > nacl_integration, ipc_tests, interactive_ui_tests, browser_tests,
> net_unittests,
> > content_unittests, gpu_unittests, base_unittests, sync_integration_tests,
> > media_unittests, safe_browsing_tests, content_browsertests, sql_unittests,
> > printing_unittests, sync_unit_tests, check_deps
> 
> LGTM.
> 
> Thanks Hans. I'm working on the roll in parallel which is non-trivial this
time.
> 
> Nico, do you know if the local changes we have in Chromium's protobuf could be
> upstreamed so that we could use DEPS to do the rolls?

agl moved it from DEPS to our repo when he added support for unknown fields to
protobuf lite. I think that part made it upstream by now, so I believe our only
changes are the addition of a gyp file, the readme file, config.h (and according
to the readme, descriptor2_pb.py).

So moving protobuf back to deps should be doable. agl can tell you more though.

[Philippe, 2012-10-02 01:16:14]

On 2012/10/02 01:10:32, Nico wrote:
> On 2012/10/01 16:48:39, Philippe wrote:
> > On 2012/10/01 08:30:13, I haz the power (commit-bot) wrote:
> > > Retried try job too often for step(s) crypto_unittests, unit_tests,
> > > cacheinvalidation_unittests, remoting_unittests, jingle_unittests,
> > > nacl_integration, ipc_tests, interactive_ui_tests, browser_tests,
> > net_unittests,
> > > content_unittests, gpu_unittests, base_unittests, sync_integration_tests,
> > > media_unittests, safe_browsing_tests, content_browsertests, sql_unittests,
> > > printing_unittests, sync_unit_tests, check_deps
> > 
> > LGTM.
> > 
> > Thanks Hans. I'm working on the roll in parallel which is non-trivial this
> time.
> > 
> > Nico, do you know if the local changes we have in Chromium's protobuf could
be
> > upstreamed so that we could use DEPS to do the rolls?
> 
> agl moved it from DEPS to our repo when he added support for unknown fields to
> protobuf lite. I think that part made it upstream by now, so I believe our
only
> changes are the addition of a gyp file, the readme file, config.h (and
according
> to the readme, descriptor2_pb.py).
> 
> So moving protobuf back to deps should be doable. agl can tell you more
though.

Thanks Nico.

I asked Adam and Pherl a few hours ago what the current status was. Apparently
this change won't be upstreamed and is a little controversial according to
Pherl. I'm still discussing it with them. I will CC you on the thread.