Changes to have chrome building with net.dll

BUG=76997
TEST=none
Review URL: http://codereview.chromium.org/7056049

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

23 files changed, 51 insertions, 12 deletions

diff --git a/app/app.gyp b/app/app.gyp
index 57388d8..5657da6 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -18,6 +18,7 @@
         'app_base',
         'app_resources',
         '../base/base.gyp:test_support_base',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
diff --git a/app/app_base.gypi b/app/app_base.gypi
index 7db04b3..c8cc64e 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -11,11 +11,13 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
-        '../ui/ui.gyp:ui_gfx',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/ui.gyp:ui_gfx',
         '<(libjpeg_gyp_path):libjpeg',
       ],
       'export_dependent_settings': [
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 27e71b0..1c41e72 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -424,6 +424,7 @@
         'chrome_strings',
         '../base/base.gyp:base',
         '../net/net.gyp:http_server',
+        '../net/net.gyp:net',
         'theme_resources',
         'theme_resources_standard',
         '../skia/skia.gyp:skia',
@@ -534,6 +535,7 @@
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../jingle/jingle.gyp:notifier',
+        '../net/net.gyp:net',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/sqlite/sqlite.gyp:sqlite',
         'app/policy/cloud_policy_codegen.gyp:policy',
@@ -801,6 +803,7 @@
       'dependencies': [
         'sync',
         '../jingle/jingle.gyp:notifier',
+        '../net/net.gyp:net',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       # This target exports a hard dependency because it depends on
@@ -821,6 +824,7 @@
         'common_net',
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:notifier',
+        '../net/net.gyp:net',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/libjingle/libjingle.gyp:libjingle',
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 23015c2..717215e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -35,6 +35,7 @@
         '../content/content.gyp:content_browser',
         '../crypto/crypto.gyp:crypto',
         '../media/media.gyp:media',
+        '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 90fea9c..abc994f 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -16,6 +16,7 @@
         'safe_browsing_proto',
         '../content/content.gyp:content_renderer',
         '../content/content.gyp:content_plugin',
+        '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 258d53a..9adb2c4 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -36,6 +36,7 @@
         '../content/content.gyp:content_gpu',
         '../ipc/ipc.gyp:test_support_ipc',
         '../media/media.gyp:media_test_support',
+        '../net/net.gyp:net',
         # 'test/test_url_request_context_getter.h' brings in this requirement.
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
@@ -451,6 +452,7 @@
         'test_support_common',
         'test_support_ui',
         '../third_party/hunspell/hunspell.gyp:hunspell',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
@@ -1199,6 +1201,7 @@
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../jingle/jingle.gyp:jingle_glue_test_util',
         '../media/media.gyp:media_test_support',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -2252,6 +2255,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
@@ -3195,6 +3199,7 @@
         'common',
         'debugger',
         '../jingle/jingle.gyp:notifier_test_util',
+        '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -3281,6 +3286,7 @@
         'renderer',
         'chrome_strings',
         'test_support_common',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc
index 3c3dfd1..84ad4929 100644
--- a/chrome/service/cloud_print/print_system_win.cc
+++ b/chrome/service/cloud_print/print_system_win.cc
@@ -31,6 +31,8 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 
+#pragma comment(lib, "rpcrt4.lib")  // for UuidToString & Co.
+
 namespace {
 
 class DevMode {
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 927837d..ce5da56 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -78,6 +78,7 @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
+        '../net/net.gyp:net',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'chrome_frame_launcher.gyp:chrome_frame_helper_lib',
@@ -116,7 +117,6 @@
         'test/win_event_receiver.cc',
         'unittest_precompile.h',
         'unittest_precompile.cc',
-        'urlmon_upload_data_stream.cc',
         'urlmon_upload_data_stream_unittest.cc',
         'vtable_patch_manager_unittest.cc',
       ],
@@ -202,6 +202,7 @@
         '../chrome/chrome.gyp:renderer',
         '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib',
         '../content/content.gyp:content_gpu',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -388,6 +389,7 @@
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:syncapi_core',
         '../content/content.gyp:content_gpu',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
@@ -533,6 +535,7 @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
@@ -613,6 +616,7 @@
         'chrome_frame_strings',
         'chrome_frame_utils',
         '../chrome/chrome.gyp:common',
+        '../net/net.gyp:net',
       ],
       'sources': [
         'chrome_frame_npapi.cc',
@@ -671,10 +675,11 @@
         'chrome_frame_strings',
         'chrome_frame_utils',
         'chrome_tab_idl',
-        '../chrome/chrome.gyp:common',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
+        '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../net/net.gyp:net',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../webkit/support/webkit_support.gyp:webkit_user_agent',
@@ -854,6 +859,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        '../net/net.gyp:net',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 77d4cce..cab27a6 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -10,6 +10,7 @@
       'dependencies': [
         'content_common',
         '../app/app.gyp:app_resources',
+        '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../skia/skia.gyp:skia',
         '../third_party/flac/flac.gyp:libflac',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index f4da646..173614b 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -11,6 +11,7 @@
         '../base/base.gyp:base',
         '../ipc/ipc.gyp:ipc',
         '../media/media.gyp:media',
+        '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index ea36f3e..f98daad 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -11,6 +11,7 @@
       'dependencies': [
         'content_common',
         '../jingle/jingle.gyp:jingle_glue',
+        '../net/net.gyp:net',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../skia/skia.gyp:skia',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
diff --git a/crypto/rsa_private_key_win.cc b/crypto/rsa_private_key_win.cc
index 293e4d66..f0e6477 100644
--- a/crypto/rsa_private_key_win.cc
+++ b/crypto/rsa_private_key_win.cc
@@ -10,6 +10,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 
+#pragma comment(lib, "crypt32.lib")
+
 namespace {
   // Helper for error handling during key import.
 #define READ_ASSERT(truth) \
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index 1206b71..bbdbc3e 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -23,6 +23,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        '../net/net.gyp:net',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
       ],
diff --git a/net/base/net_log.h b/net/base/net_log.h
index 6eb2337..be42d44 100644
--- a/net/base/net_log.h
+++ b/net/base/net_log.h
@@ -267,7 +267,7 @@ class NetLogIntegerParameter : public NetLog::EventParameters {
 
 // NetLogSourceParameter is a subclass of EventParameters that encapsulates a
 // single NetLog::Source parameter.
-class NetLogSourceParameter : public NetLog::EventParameters {
+class NET_API NetLogSourceParameter : public NetLog::EventParameters {
  public:
   // |name| must be a string literal.
   NetLogSourceParameter(const char* name, const NetLog::Source& value)
diff --git a/net/base/net_util.h b/net/base/net_util.h
index 7ded66d..7ee1337 100644
--- a/net/base/net_util.h
+++ b/net/base/net_util.h
@@ -274,7 +274,7 @@ bool IsPortAllowedByFtp(int port);
 bool IsPortAllowedByOverride(int port);
 
 // Set socket to non-blocking mode
-int SetNonBlocking(int fd);
+NET_API int SetNonBlocking(int fd);
 
 // Formats the host in |url| and appends it to |output|.  The host formatter
 // takes the same accept languages component as ElideURL().
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index 0ad7080..65a088b 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -362,7 +362,7 @@ class NET_API ProxyService : public NetworkChangeNotifier::IPAddressObserver,
 };
 
 // Wrapper for invoking methods on a ProxyService synchronously.
-class SyncProxyServiceHelper
+class NET_API SyncProxyServiceHelper
     : public base::RefCountedThreadSafe<SyncProxyServiceHelper> {
  public:
   SyncProxyServiceHelper(MessageLoop* io_message_loop,
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index f04cef2..bf1cb84 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -561,9 +561,9 @@ class NET_API URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe) {
     priority_ = priority;
   }
 
-#ifdef UNIT_TEST
+  // This method is intended only for unit tests, but it is being used by
+  // unit tests outside of net :(.
   URLRequestJob* job() { return job_; }
-#endif
 
  protected:
   // Allow the URLRequestJob class to control the is_pending() flag.
diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h
index 8b275b9e..19e2de2f 100644
--- a/net/url_request/url_request_netlog_params.h
+++ b/net/url_request/url_request_netlog_params.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -10,13 +10,14 @@
 
 #include "base/basictypes.h"
 #include "googleurl/src/gurl.h"
+#include "net/base/net_api.h"
 #include "net/base/net_log.h"
 #include "net/base/request_priority.h"
 
 namespace net {
 
 // Holds the parameters to emit to the NetLog when starting a URLRequest.
-class URLRequestStartEventParameters : public NetLog::EventParameters {
+class NET_API URLRequestStartEventParameters : public NetLog::EventParameters {
  public:
   URLRequestStartEventParameters(const GURL& url,
                                  const std::string& method,
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 156f29d..e03343f 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -233,6 +233,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/ui.gyp:ui_gfx',
+        '../net/net.gyp:net',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         '../third_party/libvpx/libvpx.gyp:libvpx_include',
         '../third_party/zlib/zlib.gyp:zlib',
@@ -499,6 +500,7 @@
         'remoting_jingle_glue',
         '../crypto/crypto.gyp:crypto',
         '../jingle/jingle.gyp:jingle_glue',
+        '../net/net.gyp:net',
       ],
       'export_dependent_settings': [
         'remoting_jingle_glue',
diff --git a/views/views.gyp b/views/views.gyp
index 2b2a531..f7f2c7b 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -65,6 +65,8 @@
         '../app/app.gyp:app_base',
         '../app/app.gyp:app_resources',
         '../base/base.gyp:base',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 5a33a87..4335c26 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -69,6 +69,8 @@ class BlobURLRequestJobTest : public testing::Test {
 
    private:
     void ReadSome(net::URLRequest* request) {
+      // job() is not part of the URLRequest public API so it should not be
+      // used here. Bug 84783.
       if (request->job()->is_done()) {
         RequestComplete();
         return;
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 5512578..7a66a3b 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -12,10 +12,11 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/ui/ui.gyp:ui_gfx',
         '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/ui/ui.gyp:ui_gfx',
         'appcache',
         'blob',
         'database',
@@ -76,6 +77,7 @@
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
+        '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/ui/ui.gyp:ui_base',
         'glue',
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index a37dfe4..2d041f1 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -348,6 +348,7 @@
         'test_shell_common',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/media/media.gyp:media_test_support',
+        '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gmock.gyp:gmock',