Reapply r72562 with willchan's nits + locally tested shlib fixes.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 7dedb46b7a31390840be8821322adcca78cb02f1..aeff6590e4bc458e4301b6202f73969965e655bd 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -866,7 +866,6 @@
         'base/escape_unittest.cc',
         'base/file_stream_unittest.cc',
         'base/filter_unittest.cc',
-        'base/filter_unittest.h',
         'base/gzip_filter_unittest.cc',
         'base/host_cache_unittest.cc',
         'base/host_mapping_rules_unittest.cc',
@@ -878,9 +877,10 @@
         'base/mapped_host_resolver_unittest.cc',
         'base/mime_sniffer_unittest.cc',
         'base/mime_util_unittest.cc',
+        'base/mock_filter_context.cc',
+        'base/mock_filter_context.h',
         'base/net_log_unittest.cc',
         'base/net_log_unittest.h',
-        'base/net_test_suite.h',
         'base/net_util_unittest.cc',
         'base/pem_tokenizer_unittest.cc',
         'base/registry_controlled_domain_unittest.cc',
@@ -947,6 +947,8 @@
         'http/http_transaction_unittest.h',
         'http/http_util_unittest.cc',
         'http/http_vary_data_unittest.cc',
+        'http/mock_allow_url_security_manager.cc',
+        'http/mock_allow_url_security_manager.h',
         'http/mock_gssapi_library_posix.cc',
         'http/mock_gssapi_library_posix.h',
         'http/mock_sspi_library_win.h',
@@ -997,7 +999,6 @@
         'url_request/url_request_job_tracker_unittest.cc',
         'url_request/url_request_throttler_unittest.cc',
         'url_request/url_request_unittest.cc',
-        'url_request/url_request_unittest.h',
         'url_request/view_cache_helper_unittest.cc',
         'websockets/websocket_frame_handler_unittest.cc',
         'websockets/websocket_handshake_draft75_unittest.cc',
@@ -1158,6 +1159,10 @@
       'sources': [
         'base/cert_test_util.cc',
         'base/cert_test_util.h',
+        'base/cookie_monster_store_test.cc',
+        'base/cookie_monster_store_test.h',
+        'base/net_test_suite.cc',
+        'base/net_test_suite.h',
         'base/test_completion_callback.cc',
         'base/test_completion_callback.h',
         'disk_cache/disk_cache_test_util.cc',
@@ -1172,6 +1177,8 @@
         'test/test_server_posix.cc',
         'test/test_server_win.cc',
         'test/test_server.h',
+        'url_request/url_request_test_util.cc',
+        'url_request/url_request_test_util.h',
       ],
       'conditions': [
         ['inside_chromium_build==1', {