diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 21:39:13 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 21:39:13 +0000 |
| commit | e73acd56ff87ba8c6ed0865305f504fe6d61a8ca (patch) | |
| tree | dcc15a0da431951a3b20d45c580719af4bd14c67 /net/url_request | |
| parent | f2b50aacbeaf43c61e8b173e73f991f34d1f2968 (diff) | |
| download | chromium_src-e73acd56ff87ba8c6ed0865305f504fe6d61a8ca.zip chromium_src-e73acd56ff87ba8c6ed0865305f504fe6d61a8ca.tar.gz chromium_src-e73acd56ff87ba8c6ed0865305f504fe6d61a8ca.tar.bz2 | |
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
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request.h | 4 | ||||
| -rw-r--r-- | net/url_request/url_request_netlog_params.h | 5 |
2 files changed, 5 insertions, 4 deletions
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, |