Revert 224269 "Don't persist HPKP if PrivacyMode is enabled."

trunk/src/net/socket_stream/socket_stream.h

 // Copyright (c) 2012 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_SOCKET_STREAM_SOCKET_STREAM_H_
 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 106 matching lines @@
   SocketStream(const GURL& url, Delegate* delegate);
 
   // The user data allows the clients to associate data with this job.
   // Multiple user data values can be stored under different keys.
   // This job will TAKE OWNERSHIP of the given data pointer, and will
   // delete the object if it is changed or the job is destroyed.
   UserData* GetUserData(const void* key) const;
   void SetUserData(const void* key, UserData* data);
 
   const GURL& url() const { return url_; }
-  GURL url_for_cookies() const { return GetURLForCookies(url_); }
   bool is_secure() const;
   const AddressList& address_list() const { return addresses_; }
   Delegate* delegate() const { return delegate_; }
   int max_pending_send_allowed() const { return max_pending_send_allowed_; }
 
   URLRequestContext* context() { return context_; }
   // There're some asynchronous operations and members that are constructed from
   // |context|. Be careful when you use this for the second time or more.
   void set_context(URLRequestContext* context);
 
@@ skipping 36 matching lines @@
   void CancelWithError(int error);
 
   // Cancels the connection because of receiving a certificate with an error.
   void CancelWithSSLError(const SSLInfo& ssl_info);
 
   // Continues to establish the connection in spite of an error. Usually this
   // case happens because users allow certificate with an error by manual
   // actions on alert dialog or browser cached such kinds of user actions.
   void ContinueDespiteError();
 
-  // Returns the URL to be used for cookie policy checking. Note that
-  // this may be different than |url|; for example, the cookie policy
-  // for a ws:// URL is based upon the http:// scheme for that
-  // host:port pair.
-  static GURL GetURLForCookies(const GURL& url);
-
  protected:
   friend class base::RefCountedThreadSafe<SocketStream>;
   virtual ~SocketStream();
 
   Delegate* delegate_;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SocketStreamTest, IOPending);
   FRIEND_TEST_ALL_PREFIXES(SocketStreamTest, SwitchAfterPending);
 
@@ skipping 193 matching lines @@
   bool server_closed_;
 
   scoped_ptr<SocketStreamMetrics> metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_SOCKET_STREAM_H_