Upstream changes to chrome_browser.gypi.

Upstream changes to chrome_browser.gypi.

Android does not need some of the dependencies since we do
not use them.
BUG=157226
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=164860

[nilesh, 2012-10-26 22:45:28]

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
File chrome/chrome_browser.gypi (right):

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
chrome/chrome_browser.gypi:2551: 'safe_browsing_report_proto',
This is already excluded if safe_browsing == 0
exclude: safe_browsing_proto (if safe_browsing is not enabled) in this file and
chrome/chrome_browser_ui.gypi

[sky, 2012-10-26 23:19:51]

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
File chrome/chrome_browser.gypi (right):

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
chrome/chrome_browser.gypi:2586: 'browser/metrics/display_utils_posix.cc',
Keep things sorted.

[shashi, 2012-10-29 17:54:55]

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
File chrome/chrome_browser.gypi (right):

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
chrome/chrome_browser.gypi:2551: 'safe_browsing_report_proto',
On 2012/10/26 22:45:28, nileshagrawal1 wrote:
> This is already excluded if safe_browsing == 0
> exclude: safe_browsing_proto (if safe_browsing is not enabled) in this file
and
> chrome/chrome_browser_ui.gypi

Done.

https://chromiumcodereview.appspot.com/11307015/diff/1/chrome/chrome_browser....
chrome/chrome_browser.gypi:2586: 'browser/metrics/display_utils_posix.cc',
On 2012/10/26 23:19:51, sky wrote:
> Keep things sorted.

Done.

[sky, 2012-10-29 18:13:58]

LGTM

[Yaron, 2012-10-29 18:45:10]

lgtm

[Yaron, 2012-10-29 18:46:22]

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
File chrome/chrome_browser.gypi (right):

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
chrome/chrome_browser.gypi:2613: 'browser/ui/uma_browsing_activity_observer.cc',
Actually I take that back. I think these browser/ui excludes aren't doing
anything. They need to move to chrome/chrome_browser_ui.gypi

[nilesh, 2012-10-29 18:54:27]

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
File chrome/chrome_browser.gypi (right):

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
chrome/chrome_browser.gypi:2592: 'browser/metrics/display_utils_posix.cc',
Please make sure all of these entries are valid, display_utils_posix.cc does not
exist anymore?

[shashi, 2012-10-29 20:27:26]

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
File chrome/chrome_browser.gypi (right):

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
chrome/chrome_browser.gypi:2592: 'browser/metrics/display_utils_posix.cc',
Thanks, done, 3 entries were of dead files.
browser/metrics/display_utils_posix.cc
browser/autocomplete/autocomplete_edit.cc
browser/ui/webui/html_dialog_tab_contents_delegate.cc

On 2012/10/29 18:54:27, nileshagrawal1 wrote:
> Please make sure all of these entries are valid, display_utils_posix.cc does
not
> exist anymore?

https://chromiumcodereview.appspot.com/11307015/diff/13003/chrome/chrome_brow...
chrome/chrome_browser.gypi:2613: 'browser/ui/uma_browsing_activity_observer.cc',
On 2012/10/29 18:46:22, Yaron wrote:
> Actually I take that back. I think these browser/ui excludes aren't doing
> anything. They need to move to chrome/chrome_browser_ui.gypi

Done.

[nilesh, 2012-10-29 20:32:41]

LGTM

[commit-bot: I haz the power, 2012-10-29 21:50:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11307015/19002

[commit-bot: I haz the power, 2012-10-30 02:17:06]

Retried try job too often for step(s) browser_tests

[commit-bot: I haz the power, 2012-10-30 02:20:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11307015/19002

[commit-bot: I haz the power, 2012-10-30 05:19:36]

Change committed as 164860