Port:

 - net/base/dns_resolution_observer.cc
 - net/http/http_network_transaction.cc
 - net/url_request/url_request_filter.cc
Add to net library the above and:
 - net/base/dns_resolution_observer.cc
 - net/base/upload_data_stream.cc
 - net/http/http_network_layer.cc
 - net/proxy/proxy_resolver_fixed.cc
 - net/proxy/proxy_service.cc
 - net/url_request/url_request_job_manager.cc
Add to net_unittests:
 - net/http/http_network_transaction_unittest.cc
 - net/http/http_transaction_unittest.cc
 - net/http/http_util_unittest.cc

Patch by Paweł Hajdan jr <phajdan.jr@gmail.com>


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

5 files changed, 7 insertions, 17 deletions

diff --git a/net/base/dns_resolution_observer.cc b/net/base/dns_resolution_observer.cc
index 71c2c10..46416d4 100644
--- a/net/base/dns_resolution_observer.cc
+++ b/net/base/dns_resolution_observer.cc
@@ -5,11 +5,10 @@
 // This file supports network stack independent notification of progress
 // towards resolving a hostname.
 
-#include <windows.h>
-#include <string>
-
 #include "net/base/dns_resolution_observer.h"
 
+#include <string>
+
 #include "base/logging.h"
 
 namespace net {
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index f7d7058..12e72e0 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -421,7 +421,8 @@ int HttpNetworkTransaction::DoInitConnectionComplete(int result) {
   // Set the reused_socket_ flag to indicate that we are using a keep-alive
   // connection.  This flag is used to handle errors that occur while we are
   // trying to reuse a keep-alive connection.
-  if (reused_socket_ = (connection_.socket() != NULL)) {
+  reused_socket_ = (connection_.socket() != NULL);
+  if (reused_socket_) {
     next_state_ = STATE_WRITE_HEADERS;
   } else {
     next_state_ = STATE_RESOLVE_HOST;
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 9f147a9..7db4aa7 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -115,26 +115,18 @@ if env['PLATFORM'] in ('posix', 'darwin'):
   # TODO(port): delete files from this list as they get ported.
   to_be_ported_files = [
       'base/directory_lister.cc',
-      'base/dns_resolution_observer.cc',
       'base/listen_socket.cc',
       'base/ssl_config_service.cc',
       'base/tcp_client_socket.cc',
       'base/telnet_server.cc',
-      'base/upload_data_stream.cc',
       'base/wininet_util.cc',
       'base/winsock_init.cc',
-      'http/http_network_layer.cc',
-      'http/http_network_transaction.cc',
       'http/http_transaction_winhttp.cc',
       'http/winhttp_request_throttle.cc',
-      'proxy/proxy_resolver_fixed.cc',
       'proxy/proxy_resolver_winhttp.cc',
-      'proxy/proxy_service.cc',
       'url_request/url_request_file_dir_job.cc',
-      'url_request/url_request_filter.cc',
       'url_request/url_request_ftp_job.cc',
       'url_request/url_request_inet_job.cc',
-      'url_request/url_request_job_manager.cc',
   ]
   for remove in to_be_ported_files:
       input_files.remove(remove)
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 8cfcdaa7..bea4aa7 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -92,7 +92,10 @@ input_files = [
     'http/http_auth_handler_basic_unittest.cc',
     'http/http_auth_handler_digest_unittest.cc',
     'http/http_chunked_decoder_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',
 ]
 
@@ -105,10 +108,7 @@ if env['PLATFORM'] == 'win32':
       'base/wininet_util_unittest.cc',
       'http/http_cache_unittest.cc',
       'http/http_network_layer_unittest.cc',
-      'http/http_network_transaction_unittest.cc',
-      'http/http_transaction_unittest.cc',
       'http/http_transaction_winhttp_unittest.cc',
-      'http/http_util_unittest.cc',
       'http/winhttp_request_throttle_unittest.cc',
       'url_request/url_request_unittest.cc',
   ])
diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc
index 239c78a..b3040da 100644
--- a/net/url_request/url_request_filter.cc
+++ b/net/url_request/url_request_filter.cc
@@ -6,8 +6,6 @@
 
 #include <set>
 
-#include "net/url_request/url_request_inet_job.h"
-
 URLRequestFilter* URLRequestFilter::shared_instance_ = NULL;
 
 /* static */