diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 23:44:30 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-20 23:44:30 +0000 |
| commit | d4cedcdab1858b6571555fd4346efa6d85556b1e (patch) | |
| tree | 97054293f480d1023c0f4f3244eb5e364c918b2f | |
| parent | eb7c7f13ef2bb278f853e282e727c4a12223bb63 (diff) | |
| download | chromium_src-d4cedcdab1858b6571555fd4346efa6d85556b1e.zip chromium_src-d4cedcdab1858b6571555fd4346efa6d85556b1e.tar.gz chromium_src-d4cedcdab1858b6571555fd4346efa6d85556b1e.tar.bz2 | |
net: Fix more regressions for net.dll
BUG=76997
TEST=none
Review URL: http://codereview.chromium.org/7202014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89759 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/proxy/sync_host_resolver.h | 3 | ||||
| -rw-r--r-- | net/proxy/sync_host_resolver_bridge.h | 1 | ||||
| -rw-r--r-- | ui/ui_base.gypi | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/net/proxy/sync_host_resolver.h b/net/proxy/sync_host_resolver.h index db06e64..44ee707 100644 --- a/net/proxy/sync_host_resolver.h +++ b/net/proxy/sync_host_resolver.h @@ -7,12 +7,13 @@ #pragma once #include "net/base/host_resolver.h" +#include "net/base/net_api.h" namespace net { // Interface used by ProxyResolverJSBindings to abstract a synchronous host // resolver module (which includes a Shutdown method). -class SyncHostResolver { +class NET_TEST SyncHostResolver { public: virtual ~SyncHostResolver() {} diff --git a/net/proxy/sync_host_resolver_bridge.h b/net/proxy/sync_host_resolver_bridge.h index 88e4cd4..1f3d981 100644 --- a/net/proxy/sync_host_resolver_bridge.h +++ b/net/proxy/sync_host_resolver_bridge.h @@ -36,6 +36,7 @@ class NET_TEST SyncHostResolverBridge : public SyncHostResolver { MessageLoop* const host_resolver_loop_; scoped_refptr<Core> core_; + DISALLOW_COPY_AND_ASSIGN(SyncHostResolverBridge); }; } // namespace net diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi index 8559c27..115ea7f 100644 --- a/ui/ui_base.gypi +++ b/ui/ui_base.gypi @@ -10,6 +10,7 @@ 'dependencies': [ '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', |