openssl build fixes, and tidy the build files

net/base/net_test_suite.h

 // Copyright (c) 2010 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_BASE_NET_TEST_SUITE_H_
 #define NET_BASE_NET_TEST_SUITE_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
 #include "net/base/mock_host_resolver.h"
+#if defined(USE_NSS)
 #include "net/ocsp/nss_ocsp.h"
+#endif
 
 class NetTestSuite : public base::TestSuite {
  public:
   NetTestSuite(int argc, char** argv) : TestSuite(argc, argv) {
   }
 
   virtual void Initialize() {
     TestSuite::Initialize();
     InitializeTestThread();
   }
 
   // Called from within Initialize(), but separate so that derived classes
   // can initialize the NetTestSuite instance only and not
   // TestSuite::Initialize().  TestSuite::Initialize() performs some global
   // initialization that can only be done once.
   void InitializeTestThread() {
     network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
 
     host_resolver_proc_ = new net::RuleBasedHostResolverProc(NULL);
     scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
     // In case any attempts are made to resolve host names, force them all to
     // be mapped to localhost.  This prevents DNS queries from being sent in
     // the process of running these unit tests.
     host_resolver_proc_->AddRule("*", "127.0.0.1");
 
     message_loop_.reset(new MessageLoopForIO());
   }
 
   virtual void Shutdown() {
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
     net::ShutdownOCSP();
 #endif  // defined(OS_LINUX)

[bulach, 2010/11/11 14:08:30]

s/OS_LINUX/USE_NSS/

[wtc, 2010/11/11 14:30:09]

You can also just delete this comment.

[joth, 2010/11/11 16:52:02]

Done.

 
     // We want to destroy this here before the TestSuite continues to tear down
     // the environment.
     message_loop_.reset();
 
     TestSuite::Shutdown();
   }
 
  private:
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<MessageLoop> message_loop_;
   scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_proc_;
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_;
 };
 
 #endif  // NET_BASE_NET_TEST_SUITE_H_