diff options
| author | Nico Weber <thakis@chromium.org> | 2015-07-09 14:20:23 -0700 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2015-07-09 21:21:10 +0000 |
| commit | 66706d26418b305f48c7124039a804a7c826a463 (patch) | |
| tree | 5ca4c141beb54537379ce7951424a539ffa1566f /components/components_tests.gyp | |
| parent | 3a37e0707298f0e0a24fe6a69bf29273b5970864 (diff) | |
| download | chromium_src-66706d26418b305f48c7124039a804a7c826a463.zip chromium_src-66706d26418b305f48c7124039a804a7c826a463.tar.gz chromium_src-66706d26418b305f48c7124039a804a7c826a463.tar.bz2 | |
Revert "Componentize chrome/browser/rlz"
This reverts commit 311a46585ee5b77486ef42d947bc7cc7566558b1 / #338040,
https://codereview.chromium.org/1212163011/. The change broke tests in official
builds (http://crbug.com/508659).
BUG=504841, 508148, 508659
TBR=sdefresne@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1229933005 .
Cr-Commit-Position: refs/heads/master@{#338150}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 6b4e101..4dd48468 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -488,9 +488,6 @@ 'rappor/rappor_utils_unittest.cc', 'rappor/sampler_unittest.cc', ], - 'rlz_unittest_sources': [ - 'rlz/rlz_tracker_unittest.cc', - ], 'scheduler_unittest_sources': [ 'scheduler/child/idle_helper_unittest.cc', 'scheduler/child/nestable_task_runner_for_test.cc', @@ -867,23 +864,6 @@ 'mime_util/mime_util.gyp:mime_util', ], 'conditions': [ - ['enable_rlz_support==1', { - 'sources': [ - '<@(rlz_unittest_sources)', - ], - 'dependencies': [ - '../net/net.gyp:net_test_support', - '../rlz/rlz.gyp:test_support_rlz', - 'components.gyp:rlz', - ], - 'conditions': [ - ['OS == "ios"', { - 'dependencies': [ - '../ui/base/ui_base.gyp:ui_base', - ], - }], - ], - }], ['toolkit_views == 1', { 'sources': [ 'bookmarks/browser/bookmark_node_data_unittest.cc', |