summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 21:56:02 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-17 21:56:02 +0000
commitc037775ea261cbd79d3c69e38f578dcd019798f1 (patch)
tree99da1836d0728a01e8ef9098380fdf0b66ba1631
parent0937f4e4788fdb9294dc5ccfeb81a17a5647cfeb (diff)
downloadchromium_src-c037775ea261cbd79d3c69e38f578dcd019798f1.zip
chromium_src-c037775ea261cbd79d3c69e38f578dcd019798f1.tar.gz
chromium_src-c037775ea261cbd79d3c69e38f578dcd019798f1.tar.bz2
net: Fix regressions for net.dll
BUG=76997 TEST=none Review URL: http://codereview.chromium.org/7111060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89558 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/dns_query.h3
-rw-r--r--net/base/dns_response.h3
-rw-r--r--printing/printing.gyp1
-rw-r--r--ui/ui_base.gypi1
4 files changed, 6 insertions, 2 deletions
diff --git a/net/base/dns_query.h b/net/base/dns_query.h
index dcc7c0c..c0884bf 100644
--- a/net/base/dns_query.h
+++ b/net/base/dns_query.h
@@ -9,12 +9,13 @@
#include <string>
#include "net/base/io_buffer.h"
+#include "net/base/net_api.h"
#include "net/base/net_util.h"
namespace net{
// Represents on-the-wire DNS query message as an object.
-class DnsQuery {
+class NET_TEST DnsQuery {
public:
// Constructs a query message from |dns_name| which *MUST* be in a valid
// DNS name format, and |qtype| which must be either kDNS_A or kDNS_AAA.
diff --git a/net/base/dns_response.h b/net/base/dns_response.h
index b0704c9..eff8ffe 100644
--- a/net/base/dns_response.h
+++ b/net/base/dns_response.h
@@ -7,12 +7,13 @@
#pragma once
#include "net/base/dns_query.h"
+#include "net/base/net_api.h"
namespace net{
// Represents on-the-wire DNS response as an object; allows extracting
// records.
-class DnsResponse {
+class NET_TEST DnsResponse {
public:
// Constructs an object with an IOBuffer large enough to read
// one byte more than largest possible response, to detect malformed
diff --git a/printing/printing.gyp b/printing/printing.gyp
index f3b7b10..d7a9d11 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -13,6 +13,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
+ '../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',
diff --git a/ui/ui_base.gypi b/ui/ui_base.gypi
index ed771f1..8559c27 100644
--- a/ui/ui_base.gypi
+++ b/ui/ui_base.gypi
@@ -9,6 +9,7 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',