Even more virtual method deinlining.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/5741001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69041 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 55 insertions, 27 deletions

diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index e9e137f..b53ec6d 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -1132,6 +1132,10 @@ void HostResolverImpl::ProbeIPv6Support() {
   OnIPAddressChanged();  // Give initial setup call.
 }
 
+HostResolverImpl* HostResolverImpl::GetAsHostResolverImpl() {
+  return this;
+}
+
 void HostResolverImpl::Shutdown() {
   DCHECK(CalledOnValidThread());
 
diff --git a/net/base/host_resolver_impl.h b/net/base/host_resolver_impl.h
index 46ce31d..68c8c0b 100644
--- a/net/base/host_resolver_impl.h
+++ b/net/base/host_resolver_impl.h
@@ -105,7 +105,7 @@ class HostResolverImpl : public HostResolver,
   // address family to IPv4 iff IPv6 is not supported.
   void ProbeIPv6Support();
 
-  virtual HostResolverImpl* GetAsHostResolverImpl() { return this; }
+  virtual HostResolverImpl* GetAsHostResolverImpl();
 
   // TODO(eroman): hack for http://crbug.com/15513
   virtual void Shutdown();
diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc
index c324709a..e97d06e 100644
--- a/net/http/http_auth_controller.cc
+++ b/net/http/http_auth_controller.cc
@@ -393,6 +393,14 @@ void HttpAuthController::ResetAuth(const string16& username,
   }
 }
 
+bool HttpAuthController::HaveAuthHandler() const {
+  return handler_.get() != NULL;
+}
+
+bool HttpAuthController::HaveAuth() const {
+  return handler_.get() && !identity_.invalid;
+}
+
 void HttpAuthController::InvalidateCurrentHandler() {
   DCHECK(CalledOnValidThread());
 
diff --git a/net/http/http_auth_controller.h b/net/http/http_auth_controller.h
index bcda707..1d0a5cd 100644
--- a/net/http/http_auth_controller.h
+++ b/net/http/http_auth_controller.h
@@ -63,13 +63,9 @@ class HttpAuthController : public base::RefCounted<HttpAuthController>,
   virtual void ResetAuth(const string16& username,
                          const string16& password);
 
-  virtual bool HaveAuthHandler() const {
-    return handler_.get() != NULL;
-  }
+  virtual bool HaveAuthHandler() const;
 
-  virtual bool HaveAuth() const {
-    return handler_.get() && !identity_.invalid;
-  }
+  virtual bool HaveAuth() const;
 
   virtual scoped_refptr<AuthChallengeInfo> auth_info();
 
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index 1e6b713..c2c2899 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -162,6 +162,10 @@ bool HttpProxyClientSocket::IsConnectedAndIdle() const {
     transport_->socket()->IsConnectedAndIdle();
 }
 
+const BoundNetLog& HttpProxyClientSocket::NetLog() const {
+  return net_log_;
+}
+
 void HttpProxyClientSocket::SetSubresourceSpeculation() {
   if (transport_.get() && transport_->socket()) {
     transport_->socket()->SetSubresourceSpeculation();
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index e11e731..8e345b9 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -74,7 +74,7 @@ class HttpProxyClientSocket : public ClientSocket {
   virtual void Disconnect();
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const;
-  virtual const BoundNetLog& NetLog() const { return net_log_; }
+  virtual const BoundNetLog& NetLog() const;
   virtual void SetSubresourceSpeculation();
   virtual void SetOmniboxSpeculation();
   virtual bool WasEverUsed() const;
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index d0c177d..13fa0a1 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_client_socket_pool.cc
@@ -422,6 +422,10 @@ void HttpProxyClientSocketPool::CloseIdleSockets() {
   base_.CloseIdleSockets();
 }
 
+int HttpProxyClientSocketPool::IdleSocketCount() const {
+  return base_.idle_socket_count();
+}
+
 int HttpProxyClientSocketPool::IdleSocketCountInGroup(
     const std::string& group_name) const {
   return base_.IdleSocketCountInGroup(group_name);
@@ -454,4 +458,12 @@ DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue(
   return dict;
 }
 
+base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const {
+  return base_.ConnectionTimeout();
+}
+
+ClientSocketPoolHistograms* HttpProxyClientSocketPool::histograms() const {
+  return base_.histograms();
+}
+
 }  // namespace net
diff --git a/net/http/http_proxy_client_socket_pool.h b/net/http/http_proxy_client_socket_pool.h
index 24dbeaa..fb3967d 100644
--- a/net/http/http_proxy_client_socket_pool.h
+++ b/net/http/http_proxy_client_socket_pool.h
@@ -204,9 +204,7 @@ class HttpProxyClientSocketPool : public ClientSocketPool {
 
   virtual void CloseIdleSockets();
 
-  virtual int IdleSocketCount() const {
-    return base_.idle_socket_count();
-  }
+  virtual int IdleSocketCount() const;
 
   virtual int IdleSocketCountInGroup(const std::string& group_name) const;
 
@@ -217,13 +215,9 @@ class HttpProxyClientSocketPool : public ClientSocketPool {
                                           const std::string& type,
                                           bool include_nested_pools) const;
 
-  virtual base::TimeDelta ConnectionTimeout() const {
-    return base_.ConnectionTimeout();
-  }
+  virtual base::TimeDelta ConnectionTimeout() const;
 
-  virtual ClientSocketPoolHistograms* histograms() const {
-    return base_.histograms();
-  };
+  virtual ClientSocketPoolHistograms* histograms() const;
 
  private:
   typedef ClientSocketPoolBase<HttpProxySocketParams> PoolBase;
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 5b21005..7124efa 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -479,6 +479,10 @@ void SSLClientSocketPool::CloseIdleSockets() {
   base_.CloseIdleSockets();
 }
 
+int SSLClientSocketPool::IdleSocketCount() const {
+  return base_.idle_socket_count();
+}
+
 int SSLClientSocketPool::IdleSocketCountInGroup(
     const std::string& group_name) const {
   return base_.IdleSocketCountInGroup(group_name);
@@ -520,4 +524,12 @@ DictionaryValue* SSLClientSocketPool::GetInfoAsValue(
   return dict;
 }
 
+base::TimeDelta SSLClientSocketPool::ConnectionTimeout() const {
+  return base_.ConnectionTimeout();
+}
+
+ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const {
+  return base_.histograms();
+}
+
 }  // namespace net
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index 5eb8594..136516f 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -209,9 +209,7 @@ class SSLClientSocketPool : public ClientSocketPool,
 
   virtual void CloseIdleSockets();
 
-  virtual int IdleSocketCount() const {
-    return base_.idle_socket_count();
-  }
+  virtual int IdleSocketCount() const;
 
   virtual int IdleSocketCountInGroup(const std::string& group_name) const;
 
@@ -222,13 +220,9 @@ class SSLClientSocketPool : public ClientSocketPool,
                                           const std::string& type,
                                           bool include_nested_pools) const;
 
-  virtual base::TimeDelta ConnectionTimeout() const {
-    return base_.ConnectionTimeout();
-  }
+  virtual base::TimeDelta ConnectionTimeout() const;
 
-  virtual ClientSocketPoolHistograms* histograms() const {
-    return base_.histograms();
-  };
+  virtual ClientSocketPoolHistograms* histograms() const;
 
  private:
   // SSLConfigService::Observer methods:
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index bb560b0..6b8190f 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -293,6 +293,10 @@ bool URLRequestHttpJob::GetContentEncodings(
   return !encoding_types->empty();
 }
 
+bool URLRequestHttpJob::IsCachedContent() const {
+  return is_cached_content_;
+}
+
 bool URLRequestHttpJob::IsSdchResponse() const {
   return sdch_dictionary_advertised_;
 }
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index bf1b37f..78778c5 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -49,7 +49,7 @@ class URLRequestHttpJob : public URLRequestJob {
   virtual int GetResponseCode() const;
   virtual bool GetContentEncodings(
       std::vector<Filter::FilterType>* encoding_type);
-  virtual bool IsCachedContent() const { return is_cached_content_; }
+  virtual bool IsCachedContent() const;
   virtual bool IsSdchResponse() const;
   virtual bool IsSafeRedirect(const GURL& location);
   virtual bool NeedsAuth();