Update Linux gyp unit_tests:

* Exclude the following from the Linux unit_tests build:
    dom_ui_unittests.cc (doesn't build)
    download_manager_unittest.cc (capture comment from SCons config about why)
* Add the following to the Linux unit_tests build:
    browser/back_forward_menu_model_unittest.cc
    browser/navigation_controller_unittest.cc
    browser/sessions/session_backend_unittest.cc
    browser/sessions/service_test_helper.cc
    browser/visitedlink_unittest.cc
    common/pref_service_unittest.cc
    renderer/render_view_Unittest.cc
    test/test_notification_tracker.cc
  Take the cautious approach of still excluding them on mac.
* Add a few miscellaneous files missing from the config:
    browser/bookmarks/bookmark_context_menu_test.cc
    common/ipc_sync_channel_unittest.h
* Fix sources alphabetization.
Review URL: http://codereview.chromium.org/59002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12926 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 28 insertions, 13 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 0829259..bb12b9c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1845,6 +1845,7 @@
         'common/ipc_message_unittest.cc',
         'common/ipc_send_fds_test.cc',
         'common/ipc_sync_channel_unittest.cc',
+        'common/ipc_sync_channel_unittest.h',
         'common/ipc_sync_message_unittest.cc',
         'common/ipc_sync_message_unittest.h',
         'common/ipc_tests.cc',
@@ -2050,6 +2051,7 @@
         'browser/autocomplete/history_url_provider_unittest.cc',
         'browser/autocomplete/keyword_provider_unittest.cc',
         'browser/back_forward_menu_model_unittest.cc',
+        'browser/bookmarks/bookmark_context_menu_test.cc',
         'browser/bookmarks/bookmark_drag_data_unittest.cc',
         'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
         'browser/bookmarks/bookmark_html_writer_unittest.cc',
@@ -2057,7 +2059,6 @@
         'browser/bookmarks/bookmark_table_model_unittest.cc',
         'browser/bookmarks/bookmark_utils_unittest.cc',
         'browser/browser_commands_unittest.cc',
-        'browser/debugger/devtools_manager_unittest.cc',
         'browser/chrome_thread_unittest.cc',
         # It is safe to list */cocoa/* files in the "common" file list
         # without an explicit exclusion since gyp is smart enough to
@@ -2066,12 +2067,13 @@
         'browser/cocoa/bookmark_menu_bridge_unittest.mm',
         'browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm',
         'browser/command_updater_unittest.cc',
+        'browser/debugger/devtools_manager_unittest.cc',
         'browser/dom_ui/dom_ui_unittest.cc',
         'browser/download/download_manager_unittest.cc',
         'browser/download/download_request_manager_unittest.cc',
         'browser/download/save_package_unittest.cc',
-        'browser/extensions/extension_unittest.cc',
         'browser/extensions/extension_ui_unittest.cc',
+        'browser/extensions/extension_unittest.cc',
         'browser/extensions/extensions_service_unittest.cc',
         'browser/extensions/user_script_master_unittest.cc',
         'browser/google_url_tracker_unittest.cc',
@@ -2199,6 +2201,29 @@
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:nss',
           ],
+          'sources!': [
+            'browser/dom_ui/dom_ui_unittest.cc',
+
+            # This test is mostly about renaming downloads to safe file
+            # names. As such we don't need/want to port it to linux. We
+            # might want to write our own tests for the download manager
+            # on linux, though.
+            'browser/download/download_manager_unittest.cc',
+          ],
+        }],
+        ['OS=="mac"', {
+          'sources!': [
+            'browser/back_forward_menu_model_unittest.cc',
+            'browser/download/download_manager_unittest.cc',
+            'browser/navigation_controller_unittest.cc',
+            'browser/sessions/session_backend_unittest.cc',
+            'browser/sessions/session_service_test_helper.cc',
+            'browser/visitedlink_unittest.cc',
+            'common/pref_service_unittest.cc',
+            'renderer/render_view_unittest.cc',
+            'test/test_notification_tracker.cc',
+            'test/test_notification_tracker.h',
+          ],
         }],
         ['OS=="win"', {
           'defines': [
@@ -2218,32 +2243,26 @@
           ],
         }, { # else: OS != "win"
           'sources!': [
-            'browser/back_forward_menu_model_unittest.cc',
+            'browser/bookmarks/bookmark_context_menu_test.cc',
             'browser/bookmarks/bookmark_drag_data_unittest.cc',
             'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
             'browser/bookmarks/bookmark_table_model_unittest.cc',
             'browser/browser_commands_unittest.cc',
-            'browser/download/download_manager_unittest.cc',
             'browser/extensions/user_script_master_unittest.cc',
             'browser/importer/firefox_importer_unittest.cc',
             'browser/importer/importer_unittest.cc',
             'browser/login_prompt_unittest.cc',
-            'browser/navigation_controller_unittest.cc',
             'browser/password_manager/encryptor_unittest.cc',
             'browser/password_manager/password_form_manager_unittest.cc',
             'browser/printing/page_number_unittest.cc',
             'browser/printing/page_overlays_unittest.cc',
             'browser/printing/print_job_unittest.cc',
             'browser/rlz/rlz_unittest.cc',
-            'browser/sessions/session_backend_unittest.cc',
-            'browser/sessions/session_service_test_helper.cc',
-            'browser/sessions/session_service_test_helper.h',
             'browser/sessions/session_service_unittest.cc',
             'browser/tabs/tab_strip_model_unittest.cc',
             'browser/views/bookmark_editor_view_unittest.cc',
             'browser/views/find_bar_win_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',
-            'browser/visitedlink_unittest.cc',
             'browser/webdata/web_database_unittest.cc',
             'browser/window_sizer_unittest.cc',
             'common/chrome_plugin_unittest.cc',
@@ -2251,14 +2270,10 @@
             'common/gfx/icon_util_unittest.cc',
             'common/net/url_util_unittest.cc',
             'common/os_exchange_data_unittest.cc',
-            'common/pref_service_unittest.cc',
-            'renderer/render_view_unittest.cc',
             'test/browser_with_test_window_test.cc',
             'test/browser_with_test_window_test.h',
             'test/in_process_browser_test.cc',
             'test/in_process_browser_test.h',
-            'test/test_notification_tracker.cc',
-            'test/test_notification_tracker.h',
             'test/ui_test_utils.cc',
             'test/ui_test_utils.h',
             'views/controls/label_unittest.cc',