* Add net_unittests and unit_tests sources that size comparisons

  revealed slipped by getting added to the SCons build:
    net\base\x509_certificate_unittest.cc
    chrome\browser\greasemonky_master_unittest.cc
    chrome\browser\greasemonky_slave_unittest.cc
    chrome\browser\template_url_prepopulate_data_unittest.cc
    chrome\renderer\render_widget_unittest.cc
* Sort file lists.
* Move net\*_unittest.cc files that don't have "win" in the
  base name to the to_be_ported_files lists for Linux and Mac.
Review URL: http://codereview.chromium.org/11587

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

2 files changed, 29 insertions, 11 deletions

diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index 3b7fd39..be3558b 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -126,8 +126,8 @@ if env['PLATFORM'] in ('posix', 'win32'):
       '$CHROME_DIR/browser/printing/units_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/bloom_filter_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/chunk_range_unittest.cc',
-      '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc',
+      '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc',
       '$CHROME_DIR/browser/safe_browsing/safe_browsing_util_unittest.cc',
       '$CHROME_DIR/common/animation_unittest.cc',
       '$CHROME_DIR/common/bzip2_unittest.cc',
@@ -156,6 +156,7 @@ if env['PLATFORM'] == 'win32':
       '$CHROME_DIR/browser/download/save_package_unittest.cc',
       '$CHROME_DIR/browser/encryptor_unittest.cc',
       '$CHROME_DIR/browser/google_url_tracker_unittest.cc',
+      '$CHROME_DIR/browser/greasemonkey_master_unittest.cc',
       '$CHROME_DIR/browser/history/expire_history_backend_unittest.cc',
       '$CHROME_DIR/browser/history/history_backend_unittest.cc',
       '$CHROME_DIR/browser/history/history_querying_unittest.cc',
@@ -188,6 +189,7 @@ if env['PLATFORM'] == 'win32':
       '$CHROME_DIR/browser/tabs/tab_strip_model_unittest.cc',
       '$CHROME_DIR/browser/template_url_model_unittest.cc',
       '$CHROME_DIR/browser/template_url_parser_unittest.cc',
+      '$CHROME_DIR/browser/template_url_prepopulate_data_unittest.cc',
       '$CHROME_DIR/browser/template_url_unittest.cc',
       '$CHROME_DIR/browser/url_fetcher_unittest.cc',
       '$CHROME_DIR/browser/url_fixer_upper_unittest.cc',
@@ -213,8 +215,10 @@ if env['PLATFORM'] == 'win32':
       '$CHROME_DIR/common/resource_dispatcher_unittest.cc',
       '$CHROME_DIR/common/time_format_unittest.cc',
       '$CHROME_DIR/common/win_util_unittest.cc',
+      '$CHROME_DIR/renderer/greasemonkey_slave_unittest.cc',
       '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc',
       '$CHROME_DIR/renderer/net/render_dns_queue_unittest.cc',
+      '$CHROME_DIR/renderer/render_widget_unittest.cc',
       '$CHROME_DIR/test/test_notification_tracker.cc',
       '$CHROME_DIR/test/test_tab_contents.cc',
       '$CHROME_DIR/test/testing_profile.cc',
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index bf908ca..084ded7 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -48,6 +48,7 @@ input_files = [
     'base/filter_unittest.cc',
     'base/gzip_filter_unittest.cc',
     'base/host_resolver_unittest.cc',
+    'base/listen_socket_unittest.cc',
     'base/mime_sniffer_unittest.cc',
     'base/mime_util_unittest.cc',
     'base/net_util_unittest.cc',
@@ -55,9 +56,9 @@ input_files = [
     'base/run_all_unittests.cc',
     'base/ssl_client_socket_unittest.cc',
     'base/tcp_client_socket_unittest.cc',
-    'base/test_completion_callback_unittest.cc',
-    'base/listen_socket_unittest.cc',
     'base/telnet_server_unittest.cc',
+    'base/test_completion_callback_unittest.cc',
+    'base/x509_certificate_unittest.cc',
     'disk_cache/addr_unittest.cc',
     'disk_cache/backend_unittest.cc',
     'disk_cache/block_files_unittest.cc',
@@ -67,37 +68,50 @@ input_files = [
     'disk_cache/mapped_file_unittest.cc',
     'disk_cache/storage_block_unittest.cc',
     'http/http_auth_cache_unittest.cc',
-    'http/http_auth_unittest.cc',
     'http/http_auth_handler_basic_unittest.cc',
     'http/http_auth_handler_digest_unittest.cc',
+    'http/http_auth_unittest.cc',
     'http/http_cache_unittest.cc',
     'http/http_chunked_decoder_unittest.cc',
-    'http/http_network_transaction_unittest.cc',
     'http/http_network_layer_unittest.cc',
+    'http/http_network_transaction_unittest.cc',
     'http/http_response_headers_unittest.cc',
     'http/http_transaction_unittest.cc',
     'http/http_util_unittest.cc',
     'http/http_vary_data_unittest.cc',
+    'proxy/proxy_service_unittest.cc',
+    'url_request/url_request_unittest.cc',
 ]
 
 if env['PLATFORM'] == 'win32':
   input_files.extend([
-      'base/sdch_filter_unittest.cc',
-      'base/ssl_config_service_unittest.cc',
       'base/wininet_util_unittest.cc',
       'http/http_transaction_winhttp_unittest.cc',
       'http/winhttp_request_throttle_unittest.cc',
-      'url_request/url_request_unittest.cc',
   ])
 
+if env['PLATFORM'] == 'posix':
+  # TODO(port):
+  to_be_ported_files = [
+      'base/x509_certificate_unittest.cc',
+      'base/sdch_filter_unittest.cc',
+      'base/ssl_config_service_unittest.cc',
+      'url_request/url_request_unittest.cc',
+  ]
+  input_files = list(set(input_files) - set(to_be_ported_files))
+
 if env['PLATFORM'] == 'darwin':
   input_files.extend([
       '../base/platform_test_mac$OBJSUFFIX',
   ])
 
-if env['PLATFORM'] == 'posix':
-  input_files.extend([
+  # TODO(port):
+  to_be_ported_files = [
+      'base/x509_certificate_unittest.cc',
+      'base/sdch_filter_unittest.cc',
+      'base/ssl_config_service_unittest.cc',
       'url_request/url_request_unittest.cc',
-  ])
+  ]
+  input_files = list(set(input_files) - set(to_be_ported_files))
 
 env.ChromeTestProgram('net_unittests', input_files)