Mac specific chromium-style issues now that the trybot is sane.

BUG=carnitas
TEST=compiles

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

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

4 files changed, 13 insertions, 5 deletions

diff --git a/net/base/ssl_config_service_mac.cc b/net/base/ssl_config_service_mac.cc
index 06f9555..e8a8ab8 100644
--- a/net/base/ssl_config_service_mac.cc
+++ b/net/base/ssl_config_service_mac.cc
@@ -66,6 +66,10 @@ SSLConfigServiceMac::SSLConfigServiceMac(TimeTicks now) : ever_updated_(false) {
   UpdateConfig(now);
 }
 
+void SSLConfigServiceMac::GetSSLConfig(SSLConfig* config) {
+  GetSSLConfigAt(config, base::TimeTicks::Now());
+}
+
 void SSLConfigServiceMac::GetSSLConfigAt(SSLConfig* config, TimeTicks now) {
   if (!ever_updated_ ||
       now - config_time_ > TimeDelta::FromSeconds(kConfigUpdateInterval))
@@ -73,6 +77,8 @@ void SSLConfigServiceMac::GetSSLConfigAt(SSLConfig* config, TimeTicks now) {
   *config = config_info_;
 }
 
+SSLConfigServiceMac::~SSLConfigServiceMac() {}
+
 // static
 bool SSLConfigServiceMac::GetSSLConfigNow(SSLConfig* config) {
   // Our own revocation checking flag is a binary value, but Mac OS X uses
diff --git a/net/base/ssl_config_service_mac.h b/net/base/ssl_config_service_mac.h
index 2583e80..b550517 100644
--- a/net/base/ssl_config_service_mac.h
+++ b/net/base/ssl_config_service_mac.h
@@ -31,15 +31,13 @@ class SSLConfigServiceMac : public SSLConfigService {
   // seconds.  This is cheaper than GetSSLConfigNow and is suitable when
   // we don't need the absolutely current configuration settings.  This
   // method is not thread-safe, so it must be called on the same thread.
-  void GetSSLConfig(SSLConfig* config) {
-    GetSSLConfigAt(config, base::TimeTicks::Now());
-  }
+  virtual void GetSSLConfig(SSLConfig* config);
 
   // Used for testing.
   void GetSSLConfigAt(SSLConfig* config, base::TimeTicks now);
 
  private:
-  virtual ~SSLConfigServiceMac() {}
+  virtual ~SSLConfigServiceMac();
 
   void UpdateConfig(base::TimeTicks now);
 
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index 73bf8da..25d1401 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -618,6 +618,10 @@ int SSLClientSocketMac::GetPeerAddress(AddressList* address) const {
   return transport_->socket()->GetPeerAddress(address);
 }
 
+const BoundNetLog& SSLClientSocketMac::NetLog() const {
+  return net_log_;
+}
+
 void SSLClientSocketMac::SetSubresourceSpeculation() {
   if (transport_.get() && transport_->socket()) {
     transport_->socket()->SetSubresourceSpeculation();
diff --git a/net/socket/ssl_client_socket_mac.h b/net/socket/ssl_client_socket_mac.h
index a3c68d6..86b7be7 100644
--- a/net/socket/ssl_client_socket_mac.h
+++ b/net/socket/ssl_client_socket_mac.h
@@ -51,7 +51,7 @@ class SSLClientSocketMac : public SSLClientSocket {
   virtual bool IsConnected() const;
   virtual bool IsConnectedAndIdle() const;
   virtual int GetPeerAddress(AddressList* address) const;
-  virtual const BoundNetLog& NetLog() const { return net_log_; }
+  virtual const BoundNetLog& NetLog() const;
   virtual void SetSubresourceSpeculation();
   virtual void SetOmniboxSpeculation();
   virtual bool WasEverUsed() const;