Clean-up inline members of nested classes (net/)

Due to a bug, the Clang-plugin style checker failed to warn about
inline constructors, destructors, non-empty virtual methods, etc.
for nested classes.

The plugin has been fixed, and this patch is part of a clean-up of all
the code that now causes the plugin to issue errors.

BUG=139346


Review URL: https://chromiumcodereview.appspot.com/10854063

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

6 files changed, 44 insertions, 24 deletions

diff --git a/net/base/multi_threaded_cert_verifier.cc b/net/base/multi_threaded_cert_verifier.cc
index 701dc10..b2c3a0a 100644
--- a/net/base/multi_threaded_cert_verifier.cc
+++ b/net/base/multi_threaded_cert_verifier.cc
@@ -460,6 +460,16 @@ void MultiThreadedCertVerifier::CancelRequest(RequestHandle req) {
   request->Cancel();
 }
 
+MultiThreadedCertVerifier::RequestParams::RequestParams(
+    const SHA1Fingerprint& cert_fingerprint_arg,
+    const SHA1Fingerprint& ca_fingerprint_arg,
+    const std::string& hostname_arg,
+    int flags_arg)
+    : cert_fingerprint(cert_fingerprint_arg),
+      ca_fingerprint(ca_fingerprint_arg),
+      hostname(hostname_arg),
+      flags(flags_arg) {}
+
 // HandleResult is called by CertVerifierWorker on the origin message loop.
 // It deletes CertVerifierJob.
 void MultiThreadedCertVerifier::HandleResult(
diff --git a/net/base/multi_threaded_cert_verifier.h b/net/base/multi_threaded_cert_verifier.h
index 1ef04ab..7407009 100644
--- a/net/base/multi_threaded_cert_verifier.h
+++ b/net/base/multi_threaded_cert_verifier.h
@@ -65,15 +65,11 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
                            RequestParamsComparators);
 
   // Input parameters of a certificate verification request.
-  struct RequestParams {
+  struct NET_EXPORT_PRIVATE RequestParams {
     RequestParams(const SHA1Fingerprint& cert_fingerprint_arg,
                   const SHA1Fingerprint& ca_fingerprint_arg,
                   const std::string& hostname_arg,
-                  int flags_arg)
-        : cert_fingerprint(cert_fingerprint_arg),
-          ca_fingerprint(ca_fingerprint_arg),
-          hostname(hostname_arg),
-          flags(flags_arg) {}
+                  int flags_arg);
 
     bool operator<(const RequestParams& other) const {
       // |flags| is compared before |cert_fingerprint|, |ca_fingerprint|, and
diff --git a/net/base/network_change_notifier_mac.cc b/net/base/network_change_notifier_mac.cc
index de4a943..c9af0484 100644
--- a/net/base/network_change_notifier_mac.cc
+++ b/net/base/network_change_notifier_mac.cc
@@ -82,6 +82,24 @@ NetworkChangeNotifierMac::GetCurrentConnectionType() const {
   return connection_type_;
 }
 
+void NetworkChangeNotifierMac::Forwarder::Init()  {
+  net_config_watcher_->SetInitialConnectionType();
+}
+
+void NetworkChangeNotifierMac::Forwarder::StartReachabilityNotifications() {
+  net_config_watcher_->StartReachabilityNotifications();
+}
+
+void NetworkChangeNotifierMac::Forwarder::SetDynamicStoreNotificationKeys(
+    SCDynamicStoreRef store)  {
+  net_config_watcher_->SetDynamicStoreNotificationKeys(store);
+}
+
+void NetworkChangeNotifierMac::Forwarder::OnNetworkConfigChange(
+    CFArrayRef changed_keys)  {
+  net_config_watcher_->OnNetworkConfigChange(changed_keys);
+}
+
 void NetworkChangeNotifierMac::SetInitialConnectionType() {
   // Called on notifier thread.
 
diff --git a/net/base/network_change_notifier_mac.h b/net/base/network_change_notifier_mac.h
index 31ad4d5..7029929 100644
--- a/net/base/network_change_notifier_mac.h
+++ b/net/base/network_change_notifier_mac.h
@@ -36,19 +36,11 @@ class NetworkChangeNotifierMac: public NetworkChangeNotifier {
         : net_config_watcher_(net_config_watcher) {}
 
     // NetworkConfigWatcherMac::Delegate implementation:
-    virtual void Init() OVERRIDE {
-      net_config_watcher_->SetInitialConnectionType();
-    }
-    virtual void StartReachabilityNotifications() OVERRIDE {
-      net_config_watcher_->StartReachabilityNotifications();
-    }
+    virtual void Init() OVERRIDE;
+    virtual void StartReachabilityNotifications() OVERRIDE;
     virtual void SetDynamicStoreNotificationKeys(
-        SCDynamicStoreRef store) OVERRIDE {
-      net_config_watcher_->SetDynamicStoreNotificationKeys(store);
-    }
-    virtual void OnNetworkConfigChange(CFArrayRef changed_keys) OVERRIDE {
-      net_config_watcher_->OnNetworkConfigChange(changed_keys);
-    }
+        SCDynamicStoreRef store) OVERRIDE;
+    virtual void OnNetworkConfigChange(CFArrayRef changed_keys) OVERRIDE;
 
    private:
     NetworkChangeNotifierMac* const net_config_watcher_;
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 747dc7e..db18853 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -54,6 +54,13 @@ TransportSecurityState::TransportSecurityState()
   : delegate_(NULL) {
 }
 
+TransportSecurityState::Iterator::Iterator(const TransportSecurityState& state)
+    : iterator_(state.enabled_hosts_.begin()),
+      end_(state.enabled_hosts_.end()) {
+}
+
+TransportSecurityState::Iterator::~Iterator() {}
+
 void TransportSecurityState::SetDelegate(
     TransportSecurityState::Delegate* delegate) {
   delegate_ = delegate;
diff --git a/net/base/transport_security_state.h b/net/base/transport_security_state.h
index 2e4b42e..01c0a26 100644
--- a/net/base/transport_security_state.h
+++ b/net/base/transport_security_state.h
@@ -151,13 +151,10 @@ class NET_EXPORT TransportSecurityState
     std::string domain;
   };
 
-  class Iterator {
+  class NET_EXPORT Iterator {
    public:
-    explicit Iterator(const TransportSecurityState& state)
-        : iterator_(state.enabled_hosts_.begin()),
-          end_(state.enabled_hosts_.end()) {
-    }
-    ~Iterator() {}
+    explicit Iterator(const TransportSecurityState& state);
+    ~Iterator();
 
     bool HasNext() const { return iterator_ != end_; }
     void Advance() { ++iterator_; }