summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 22:53:46 +0000
committerjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-17 22:53:46 +0000
commit740f19ec5c056e340fae3343a7678448e897275f (patch)
tree43f18a3760ffa49586907800bc26eff073c04d1e /chrome/chrome_tests.gypi
parentcf54865e9baedb5e2590a33f7f316e7c8d4e46d5 (diff)
downloadchromium_src-740f19ec5c056e340fae3343a7678448e897275f.zip
chromium_src-740f19ec5c056e340fae3343a7678448e897275f.tar.gz
chromium_src-740f19ec5c056e340fae3343a7678448e897275f.tar.bz2
Revert 50148:
It causes the unit-test, ui-tests and more to fail with a not found symbol. - Porting the infobars on Linux to the new TranslateInfobarDelegate2. Each translate infobar is now its own class and most of the logic is in the delegate. BUG=40828 TEST=Thoroughly test the translate feature on Linux. Review URL: http://codereview.chromium.org/2836006 TBR=jcivelli@chromium.org Review URL: http://codereview.chromium.org/2805016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rwxr-xr-xchrome/chrome_tests.gypi5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0ece3eb..0125bf5 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -966,6 +966,7 @@
'browser/task_manager_unittest.cc',
'browser/theme_resources_util_unittest.cc',
'browser/thumbnail_store_unittest.cc',
+ 'browser/translate/translate_manager_unittest.cc',
'browser/translate/translate_manager2_unittest.cc',
'browser/user_style_sheet_watcher_unittest.cc',
'browser/views/accessibility_event_router_views_unittest.cc',
@@ -1147,7 +1148,6 @@
],
'sources': [
'browser/spellchecker_platform_engine_unittest.cc',
- 'browser/translate/translate_manager_unittest.cc',
],
'sources!': [
# Blocked on bookmark manager.
@@ -1158,7 +1158,6 @@
'browser/views/accessibility_event_router_views_unittest.cc',
'browser/views/bookmark_bar_view_unittest.cc',
'browser/views/bookmark_context_menu_test.cc',
- 'browser/translate/translate_manager2_unittest.cc',
'tools/convert_dict/convert_dict_unittest.cc',
'../third_party/hunspell/google/hunspell_tests.cc',
],
@@ -1232,6 +1231,7 @@
],
'sources/': [
['exclude', 'browser/gtk/tabs/tab_renderer_gtk_unittest\\.cc$'],
+ ['exclude', 'browser/translate/translate_manager_unittest\\.cc$'],
],
'link_settings': {
'libraries': [
@@ -1263,6 +1263,7 @@
'browser/printing/print_job_unittest.cc',
'browser/rlz/rlz_unittest.cc',
'browser/search_engines/template_url_scraper_unittest.cc',
+ 'browser/translate/translate_manager2_unittest.cc',
'browser/views/bookmark_editor_view_unittest.cc',
'browser/views/extensions/browser_action_drag_data_unittest.cc',
'browser/views/find_bar_host_unittest.cc',