Remove HttpServerProperies::GetWeakPtr().

net/spdy/spdy_session_pool.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_SPDY_SPDY_SESSION_POOL_H_
 #define NET_SPDY_SPDY_SESSION_POOL_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 31 matching lines @@
 class NET_EXPORT SpdySessionPool
     : public NetworkChangeNotifier::IPAddressObserver,
       public SSLConfigService::Observer,
       public CertDatabase::Observer {
  public:
   typedef base::TimeTicks (*TimeFunc)(void);
 
   // |default_protocol| may be kProtoUnknown (e.g., if SPDY is
   // disabled), in which case it's set to a default value. Otherwise,
   // it must be a SPDY protocol.
-  SpdySessionPool(
-      HostResolver* host_resolver,
-      SSLConfigService* ssl_config_service,
-      const base::WeakPtr<HttpServerProperties>& http_server_properties,
-      TransportSecurityState* transport_security_state,
-      bool enable_ping_based_connection_checking,
-      bool enable_priority_dependencies,
-      NextProto default_protocol,
-      size_t session_max_recv_window_size,
-      size_t stream_max_recv_window_size,
-      SpdySessionPool::TimeFunc time_func,
-      ProxyDelegate* proxy_delegate);
+  SpdySessionPool(HostResolver* host_resolver,
+                  SSLConfigService* ssl_config_service,
+                  HttpServerProperties* const http_server_properties,

[asanka, 2016/06/07 20:19:56]

Same comment as above. 'const' applies to the value of the pointer and isn't
meaningful in a declaration.

[Bence, 2016/06/08 18:27:18]

Done.

+                  TransportSecurityState* transport_security_state,
+                  bool enable_ping_based_connection_checking,
+                  bool enable_priority_dependencies,
+                  NextProto default_protocol,
+                  size_t session_max_recv_window_size,
+                  size_t stream_max_recv_window_size,
+                  SpdySessionPool::TimeFunc time_func,
+                  ProxyDelegate* proxy_delegate);
   ~SpdySessionPool() override;
 
   // In the functions below, a session is "available" if this pool has
   // a reference to it and there is some SpdySessionKey for which
   // FindAvailableSession() will return it. A session is "unavailable"
   // if this pool has a reference to it but it won't be returned by
   // FindAvailableSession() for any SpdySessionKey; for example, this
   // can happen when a session receives a GOAWAY frame and is still
   // processing existing streams.
 
@@ skipping 52 matching lines @@
   // (Un)register a SpdySession with an unclaimed pushed stream for |url|, so
   // that the right SpdySession can be served by FindAvailableSession.
   void RegisterUnclaimedPushedStream(GURL url,
                                      base::WeakPtr<SpdySession> spdy_session);
   void UnregisterUnclaimedPushedStream(const GURL& url,
                                        SpdySession* spdy_session);
 
   // Creates a Value summary of the state of the spdy session pool.
   std::unique_ptr<base::Value> SpdySessionPoolInfoToValue() const;
 
-  base::WeakPtr<HttpServerProperties> http_server_properties() {
+  HttpServerProperties* http_server_properties() const {

[asanka, 2016/06/07 20:19:56]

Minor nit: This shouldn't be const unless you are returning a 'const
HttpServerProperties*' since technically the server properties are a part of the
state affecting |this|.

Not a style violation as far as I could find, so up to you.

[Bence, 2016/06/08 18:27:18]

Done.  Made the same change to ChromeBrowserStateIOData, also removing const
qualifier from set_http_server_properties member.

Note that there is a similar issue with ProfileIOData and UrlRequestContext, but
(1) the const qualifier was already there, it's not introduced by this CL, and
(2) I cannot remove it easily because methods are called on const instances.

     return http_server_properties_;
   }
 
   // NetworkChangeNotifier::IPAddressObserver methods:
 
   // We flush all idle sessions and release references to the active ones so
   // they won't get re-used.  The active ones will either complete successfully
   // or error out due to the IP address change.
   void OnIPAddressChanged() override;
 
@@ skipping 43 matching lines @@
   WeakSessionList GetCurrentSessions() const;
 
   // Close only the currently existing SpdySessions with |error|.  Let
   // any new ones created while this method is running continue to
   // live. If |idle_only| is true only idle sessions are closed.
   void CloseCurrentSessionsHelper(
       Error error,
       const std::string& description,
       bool idle_only);
 
-  const base::WeakPtr<HttpServerProperties> http_server_properties_;
+  HttpServerProperties* const http_server_properties_;
 
   TransportSecurityState* transport_security_state_;
 
   // The set of all sessions. This is a superset of the sessions in
   // |available_sessions_|.
   //
   // |sessions_| owns all its SpdySession objects.
   SessionSet sessions_;
 
   // This is a map of available sessions by key. A session may appear
@@ skipping 27 matching lines @@
   // resources from origins that are different from those of their associated
   // streams. May be nullptr.
   ProxyDelegate* proxy_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(SpdySessionPool);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_POOL_H_