Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Issue 1763023: Re-apply http://codereview.chromium.org/1622012 (Closed)

Created:
10 years, 7 months ago by Timur Iskhodzhanov
Modified:
9 years, 6 months ago
CC:
chromium-reviews, ncarter (slow), ben+cc_chromium.org, idana, cbentzel+watch_chromium.org, darin-cc_chromium.org, Paweł Hajdan Jr., pam+watch_chromium.org, tim (not reviewing)
Visibility:
Public.

Description

Patch Set 1 #

Patch Set 2 : Add missing files (I thought git would do that) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2435 lines, -98 lines) Patch
M chrome/browser/sync/profile_sync_service.cc View 1 chunk +1 line, -1 line 0 comments Download
A chrome/browser/sync/protocol/sync_proto.gyp View 1 chunk +73 lines, -0 lines 0 comments Download
M chrome/chrome.gyp View 3 chunks +4 lines, -54 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 chunk +1 line, -1 line 0 comments Download
M chrome/chrome_tests.gypi View 5 chunks +7 lines, -5 lines 0 comments Download
M chrome/test/in_process_browser_test.h View 2 chunks +6 lines, -4 lines 0 comments Download
M chrome/test/in_process_browser_test.cc View 3 chunks +8 lines, -4 lines 0 comments Download
M chrome/test/live_sync/live_sync_test.h View 3 chunks +23 lines, -0 lines 0 comments Download
M chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc View 8 chunks +18 lines, -24 lines 0 comments Download
M chrome/test/memory_test/memory_test.cc View 1 chunk +1 line, -1 line 0 comments Download
M net/net.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M net/socket/ssl_test_util.cc View 2 chunks +8 lines, -1 line 0 comments Download
A net/tools/testserver/chromiumsync.py View 1 chunk +653 lines, -0 lines 0 comments Download
A net/tools/testserver/chromiumsync_test.py View 1 chunk +317 lines, -0 lines 0 comments Download
M net/tools/testserver/testserver.py View 7 chunks +58 lines, -3 lines 0 comments Download
A third_party/protobuf2/__init__.py View 1 chunk +2 lines, -0 lines 0 comments Download
A third_party/protobuf2/descriptor_pb2.py View 1 chunk +1172 lines, -0 lines 0 comments Download
M third_party/protobuf2/protobuf.gyp View 2 chunks +81 lines, -0 lines 0 comments Download

Messages

Total messages: 5 (0 generated)
Timur Iskhodzhanov
10 years, 7 months ago (2010-04-30 13:43:12 UTC) #1
Alexander Potapenko
On 2010/04/30 13:43:12, Timur Iskhodzhanov wrote: > LGTM assuming this is the same patch as ...
10 years, 7 months ago (2010-04-30 13:47:15 UTC) #2
Paweł Hajdan Jr.
Make sure that you have green trybot runs for at least linux, mac, win (and ...
10 years, 7 months ago (2010-04-30 13:52:27 UTC) #3
Timur Iskhodzhanov
Sure. Actually, you may notice that the tryjobs at the fix-CL http://codereview.chromium.org/1736026 were run against ...
10 years, 7 months ago (2010-04-30 13:57:15 UTC) #4
ncarter (slow)
10 years, 7 months ago (2010-04-30 16:40:53 UTC) #5
Thanks for making this work, and sorry for not catching it myself.

FWIW: The protobuf standard library uses pkg_resources from setuptools to
declare a namespace package to deal with precisely this conflict.  There was
some discussion of that here:
https://groups.google.com/group/protobuf/browse_thread/thread/401e6e54e6b4657...

I think we might just want to move to using pkg_resources to deal with the
'google' package collision. Python 2.6 includes pkg_resources by default,
but I imagine upgrading might be tricker than just pulling in a library.

 - nick

On Fri, Apr 30, 2010 at 6:57 AM, <timurrrr@chromium.org> wrote:

> Sure.
>
> Actually, you may notice that the tryjobs at the fix-CL
> http://codereview.chromium.org/1736026 were run against the revisions
> before
> your revert :-)
> But anyway, I'll wait for a few tryjobs to finish
>
> On 2010/04/30 13:52:27, Paweł Hajdan Jr. wrote:
>
>> Make sure that you have green trybot runs for at least linux, mac, win
>> (and
>> their release versions), and the valgrind trybots.
>>
>
>  After that, LGTM!
>>
>
>
>
> http://codereview.chromium.org/1763023/show
>

Powered by Google App Engine
This is Rietveld 408576698