summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/net.gyp4
-rw-r--r--net/url_request/https_prober.cc (renamed from net/base/https_prober.cc)2
-rw-r--r--net/url_request/https_prober.h (renamed from net/base/https_prober.h)0
-rw-r--r--net/url_request/url_request_http_job.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 85cdb01..5be0bee 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -78,8 +78,6 @@
'base/host_resolver_impl.h',
'base/host_resolver_proc.cc',
'base/host_resolver_proc.h',
- 'base/https_prober.h',
- 'base/https_prober.cc',
'base/io_buffer.cc',
'base/io_buffer.h',
'base/keygen_handler.cc',
@@ -491,6 +489,8 @@
'spdy/spdy_stream.cc',
'spdy/spdy_stream.h',
'spdy/spdy_transaction_factory.h',
+ 'url_request/https_prober.h',
+ 'url_request/https_prober.cc',
'url_request/url_request.cc',
'url_request/url_request.h',
'url_request/url_request_about_job.cc',
diff --git a/net/base/https_prober.cc b/net/url_request/https_prober.cc
index c37f17d..a7163ba 100644
--- a/net/base/https_prober.cc
+++ b/net/url_request/https_prober.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "net/base/https_prober.h"
+#include "net/url_request/https_prober.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
diff --git a/net/base/https_prober.h b/net/url_request/https_prober.h
index 327fc16..327fc16 100644
--- a/net/base/https_prober.h
+++ b/net/url_request/https_prober.h
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index c907a6a..420100f 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -15,7 +15,6 @@
#include "net/base/cert_status_flags.h"
#include "net/base/cookie_policy.h"
#include "net/base/filter.h"
-#include "net/base/https_prober.h"
#include "net/base/transport_security_state.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
@@ -28,6 +27,7 @@
#include "net/http/http_transaction.h"
#include "net/http/http_transaction_factory.h"
#include "net/http/http_util.h"
+#include "net/url_request/https_prober.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_error_job.h"