Merge r25564 and r26588 from the trunk....

net/net.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 197 matching lines @@
         'http/http_auth_cache.cc',
         'http/http_auth_cache.h',
         'http/http_auth_handler.h',
         'http/http_auth_handler.cc',
         'http/http_auth_handler_basic.cc',
         'http/http_auth_handler_basic.h',
         'http/http_auth_handler_digest.cc',
         'http/http_auth_handler_digest.h',
         'http/http_auth_handler_ntlm.cc',
         'http/http_auth_handler_ntlm.h',
+        'http/http_auth_handler_ntlm_portable.cc',
+        'http/http_auth_handler_ntlm_win.cc',
         'http/http_basic_stream.h',
         'http/http_byte_range.cc',
         'http/http_byte_range.h',
         'http/http_cache.cc',
         'http/http_cache.h',
         'http/http_chunked_decoder.cc',
         'http/http_chunked_decoder.h',
         'http/http_network_layer.cc',
         'http/http_network_layer.h',
         'http/http_network_session.cc',
@@ skipping 128 matching lines @@
         [ 'OS == "linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gdk',
             '../build/linux/system.gyp:nss',
           ],
         }],
         [ 'OS == "win"', {
             'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ],
             'sources!': [
+              'http/http_auth_handler_ntlm_portable.cc',
               'socket/tcp_client_socket_libevent.cc',
             ],
             'dependencies': [
               'tld_cleanup',
             ],
             'configurations': {
               'Debug': {
                 'msvs_precompiled_header': 'build/precompiled_net.h',
                 'msvs_precompiled_source': 'build/precompiled_net.cc',
               },
@@ skipping 330 matching lines @@
           'sources': [
             'tools/dump_cache/dump_cache.cc',
             'tools/dump_cache/dump_files.cc',
             'tools/dump_cache/upgrade.cc',
           ],
         },
       ],
     }],
   ],
 }