openssl build fixes, and tidy the build files

chrome/common/net/url_fetcher_unittest.cc

Index: chrome/common/net/url_fetcher_unittest.cc
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index 466d8e66bd9cfc4fa2a7abd7e3617e09829ab374..65fb3c58577c70861c62391591555c0d00e11aa8 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -15,7 +15,7 @@
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
 #include "net/ocsp/nss_ocsp.h"
 #endif
 
@@ -79,13 +79,13 @@ class URLFetcherTest : public testing::Test, public URLFetcher::Delegate {
 
     // Ensure that any plugin operations done by other tests are cleaned up.
     ChromePluginLib::UnloadAllPlugins();
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
     net::EnsureOCSPInit();
 #endif
   }
 
   virtual void TearDown() {
-#if defined(OS_LINUX)
+#if defined(USE_NSS)
     net::ShutdownOCSP();
 #endif
   }