summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/url_info.cc11
-rw-r--r--chrome/browser/net/url_info.h12
-rw-r--r--chrome/browser/net/url_request_mock_net_error_job.cc14
-rw-r--r--chrome/browser/net/url_request_mock_net_error_job.h14
4 files changed, 28 insertions, 23 deletions
diff --git a/chrome/browser/net/url_info.cc b/chrome/browser/net/url_info.cc
index cbf35db..c383359 100644
--- a/chrome/browser/net/url_info.cc
+++ b/chrome/browser/net/url_info.cc
@@ -30,6 +30,17 @@ void EnablePredictorDetailedLog(bool enable) {
// static
int UrlInfo::sequence_counter = 1;
+UrlInfo::UrlInfo()
+ : state_(PENDING),
+ old_prequeue_state_(state_),
+ resolve_duration_(kNullDuration),
+ queue_duration_(kNullDuration),
+ sequence_number_(0),
+ motivation_(NO_PREFETCH_MOTIVATION),
+ was_linked_(false) {
+}
+
+UrlInfo::~UrlInfo() {}
bool UrlInfo::NeedsDnsUpdate() {
switch (state_) {
diff --git a/chrome/browser/net/url_info.h b/chrome/browser/net/url_info.h
index 6b50f42..378edbf 100644
--- a/chrome/browser/net/url_info.h
+++ b/chrome/browser/net/url_info.h
@@ -74,17 +74,9 @@ class UrlInfo {
// UrlInfo are usually made by the default constructor during
// initializing of the Predictor's map (of info for Hostnames).
- UrlInfo()
- : state_(PENDING),
- old_prequeue_state_(state_),
- resolve_duration_(kNullDuration),
- queue_duration_(kNullDuration),
- sequence_number_(0),
- motivation_(NO_PREFETCH_MOTIVATION),
- was_linked_(false) {
- }
+ UrlInfo();
- ~UrlInfo() {}
+ ~UrlInfo();
// NeedDnsUpdate decides, based on our internal info,
// if it would be valuable to attempt to update (prefectch)
diff --git a/chrome/browser/net/url_request_mock_net_error_job.cc b/chrome/browser/net/url_request_mock_net_error_job.cc
index a590833..f4aa330 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.cc
+++ b/chrome/browser/net/url_request_mock_net_error_job.cc
@@ -19,6 +19,20 @@
URLRequestMockNetErrorJob::URLMockInfoMap
URLRequestMockNetErrorJob::url_mock_info_map_;
+struct URLRequestMockNetErrorJob::MockInfo {
+ MockInfo() : ssl_cert(NULL) { }
+ MockInfo(std::wstring base,
+ std::vector<int> errors,
+ net::X509Certificate* ssl_cert)
+ : base(base),
+ errors(errors),
+ ssl_cert(ssl_cert) { }
+
+ std::wstring base;
+ std::vector<int> errors;
+ scoped_refptr<net::X509Certificate> ssl_cert;
+};
+
// static
void URLRequestMockNetErrorJob::AddMockedURL(const GURL& url,
const std::wstring& base,
diff --git a/chrome/browser/net/url_request_mock_net_error_job.h b/chrome/browser/net/url_request_mock_net_error_job.h
index 4519161..059272f 100644
--- a/chrome/browser/net/url_request_mock_net_error_job.h
+++ b/chrome/browser/net/url_request_mock_net_error_job.h
@@ -38,19 +38,6 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
private:
~URLRequestMockNetErrorJob();
- struct MockInfo {
- MockInfo() : ssl_cert(NULL) { }
- MockInfo(std::wstring base,
- std::vector<int> errors,
- net::X509Certificate* ssl_cert)
- : base(base),
- errors(errors),
- ssl_cert(ssl_cert) { }
-
- std::wstring base;
- std::vector<int> errors;
- scoped_refptr<net::X509Certificate> ssl_cert;
- };
static URLRequest::ProtocolFactory Factory;
@@ -62,6 +49,7 @@ class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
// The certificate to use for SSL errors.
scoped_refptr<net::X509Certificate> ssl_cert_;
+ struct MockInfo;
typedef std::map<GURL, MockInfo> URLMockInfoMap;
static URLMockInfoMap url_mock_info_map_;