From be4d55fe8d843628223a7b40162007ab734d1402 Mon Sep 17 00:00:00 2001 From: "mnissler@chromium.org" Date: Tue, 1 Jun 2010 13:40:02 +0000 Subject: Move net::HTTPSProber from net_base to net net::HTTPSProber belongs into the net library, where also it's only user net::URLRequest is living. This fixes undefined references in net_base caused by net::HTTPSProber when not linking against net. BUG=45493 TEST=Building hresolv with the plain ld linker in shared library configuration should not generate undefined references. Review URL: http://codereview.chromium.org/2441001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48632 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/https_prober.cc | 80 ------------------------------------------------ net/base/https_prober.h | 73 ------------------------------------------- 2 files changed, 153 deletions(-) delete mode 100644 net/base/https_prober.cc delete mode 100644 net/base/https_prober.h (limited to 'net/base') diff --git a/net/base/https_prober.cc b/net/base/https_prober.cc deleted file mode 100644 index c37f17d..0000000 --- a/net/base/https_prober.cc +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (c) 2009 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. - -#include "net/base/https_prober.h" - -#include "net/url_request/url_request.h" -#include "net/url_request/url_request_context.h" - -namespace net { - -bool HTTPSProber::HaveProbed(const std::string& host) const { - return probed_.find(host) != probed_.end(); -} - -bool HTTPSProber::InFlight(const std::string& host) const { - return inflight_probes_.find(host) != inflight_probes_.end(); -} - -bool HTTPSProber::ProbeHost(const std::string& host, URLRequestContext* ctx, - HTTPSProberDelegate* delegate) { - if (HaveProbed(host) || InFlight(host)) { - return false; - } - - inflight_probes_[host] = delegate; - - GURL url("https://" + host); - DCHECK_EQ(url.host(), host); - - URLRequest* req = new URLRequest(url, this); - req->set_context(ctx); - req->Start(); - return true; -} - -void HTTPSProber::Success(URLRequest* request) { - DoCallback(request, true); -} - -void HTTPSProber::Failure(URLRequest* request) { - DoCallback(request, false); -} - -void HTTPSProber::DoCallback(URLRequest* request, bool result) { - std::map::iterator i = - inflight_probes_.find(request->original_url().host()); - DCHECK(i != inflight_probes_.end()); - - HTTPSProberDelegate* delegate = i->second; - inflight_probes_.erase(i); - probed_.insert(request->original_url().host()); - delete request; - delegate->ProbeComplete(result); -} - -void HTTPSProber::OnAuthRequired(URLRequest* request, - net::AuthChallengeInfo* auth_info) { - Success(request); -} - -void HTTPSProber::OnSSLCertificateError(URLRequest* request, - int cert_error, - net::X509Certificate* cert) { - request->ContinueDespiteLastError(); -} - -void HTTPSProber::OnResponseStarted(URLRequest* request) { - if (request->status().status() == URLRequestStatus::SUCCESS) { - Success(request); - } else { - Failure(request); - } -} - -void HTTPSProber::OnReadCompleted(URLRequest* request, int bytes_read) { - NOTREACHED(); -} - -} // namespace net diff --git a/net/base/https_prober.h b/net/base/https_prober.h deleted file mode 100644 index 327fc16..0000000 --- a/net/base/https_prober.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2009 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. - -#ifndef NET_BASE_HTTPS_PROBER_H_ -#define NET_BASE_HTTPS_PROBER_H_ - -#include -#include -#include - -#include "base/singleton.h" -#include "base/task.h" -#include "net/url_request/url_request.h" - -class URLRequestContext; - -namespace net { - -// This should be scoped inside HTTPSProber, but VC cannot compile -// HTTPProber::Delegate when HTTPSProber also inherits from -// URLRequest::Delegate. -class HTTPSProberDelegate { - public: - virtual void ProbeComplete(bool result) = 0; -}; - -// HTTPSProber is a singleton object that manages HTTPS probes. A HTTPS probe -// determines if we can connect to a given host over HTTPS. It's used when -// transparently upgrading from HTTP to HTTPS (for example, for SPDY). -class HTTPSProber : public URLRequest::Delegate { - public: - HTTPSProber() { } - - // HaveProbed returns true if the given host is known to have been probed - // since the browser was last started. - bool HaveProbed(const std::string& host) const; - - // InFlight returns true iff a probe for the given host is currently active. - bool InFlight(const std::string& host) const; - - // ProbeHost starts a new probe for the given host. If the host is known to - // have been probed since the browser was started, false is returned and no - // other action is taken. If a probe to the given host in currently inflight, - // false will be returned, and no other action is taken. Otherwise, a new - // probe is started, true is returned and the Delegate will be called with the - // results (true means a successful handshake). - bool ProbeHost(const std::string& host, URLRequestContext* ctx, - HTTPSProberDelegate* delegate); - - // Implementation of URLRequest::Delegate - void OnAuthRequired(URLRequest* request, - net::AuthChallengeInfo* auth_info); - void OnSSLCertificateError(URLRequest* request, - int cert_error, - net::X509Certificate* cert); - void OnResponseStarted(URLRequest* request); - void OnReadCompleted(URLRequest* request, int bytes_read); - - private: - void Success(URLRequest* request); - void Failure(URLRequest* request); - void DoCallback(URLRequest* request, bool result); - - std::map inflight_probes_; - std::set probed_; - - friend struct DefaultSingletonTraits; - DISALLOW_EVIL_CONSTRUCTORS(HTTPSProber); -}; - -} // namespace net -#endif -- cgit v1.1