Quick fix to avoid crashing in unit tests when HTTPTestServer::CreateServer r...

webkit/appcache/appcache_update_job_unittest.cc

 // 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/stl_util-inl.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "net/base/net_errors.h"
@@ skipping 355 matching lines @@
         kDocRoot, io_thread_->message_loop()).release();
     ASSERT_TRUE(http_server_);
     request_context_ = new TestURLRequestContext();
     request_context_->AddRef();
   }
 
   static base::WaitableEvent* io_thread_shutdown_event_;
 
   // Cleanup function; must be called on the IO Thread.
   static void CleanupIOThread() {
-    http_server_->Release();
-    http_server_ = NULL;
-    request_context_->Release();
-    request_context_ = NULL;
+    if (http_server_) {
+      http_server_->Release();
+      http_server_ = NULL;
+    }
+    if (request_context_) {
+      request_context_->Release();
+      request_context_ = NULL;
+    }
     io_thread_shutdown_event_->Signal();
   }
 
   static void TearDownTestCase() {
     io_thread_shutdown_event_ = new base::WaitableEvent(false, false);
     io_thread_->message_loop()->PostTask(FROM_HERE,
       NewRunnableFunction(CleanupIOThread));
     io_thread_shutdown_event_->Wait();
     delete io_thread_shutdown_event_;
     delete io_thread_;
     io_thread_ = NULL;
   }
 
   // Use a separate IO thread to run a test. Thread will be destroyed
   // when it goes out of scope.
   template <class Method>
   void RunTestOnIOThread(Method method) {
+    EXPECT_TRUE(http_server_);
+    if (!http_server_)
+      return;  // Don't even try to run any of these tests w/o the server.
+
     event_.reset(new base::WaitableEvent(false, false));
     io_thread_->message_loop()->PostTask(
         FROM_HERE, NewRunnableMethod(this, method));
 
     // Wait until task is done before exiting the test.
     event_->Wait();
   }
 
   void StartCacheAttemptTest() {
     ASSERT_EQ(MessageLoop::TYPE_IO, MessageLoop::current()->type());
@@ skipping 2624 matching lines @@
 }
 
 TEST_F(AppCacheUpdateJobTest, UpgradeFetchManifestFail) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::UpgradeFetchManifestFailTest);
 }
 
 TEST_F(AppCacheUpdateJobTest, ManifestRedirect) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestRedirectTest);
 }
 
-#if defined(OS_MACOSX)
-// Crashing on mac webkit bots. http://crbug.com/45664
-#define MAYBE_ManifestWrongMimeType DISABLED_ManifestWrongMimeType
-#else
-#define MAYBE_ManifestWrongMimeType ManifestWrongMimeType
-#endif
-
-TEST_F(AppCacheUpdateJobTest, MAYBE_ManifestWrongMimeType) {
+TEST_F(AppCacheUpdateJobTest, ManifestWrongMimeType) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestWrongMimeTypeTest);
 }
 
 TEST_F(AppCacheUpdateJobTest, ManifestNotFound) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestNotFoundTest);
 }
 
 TEST_F(AppCacheUpdateJobTest, ManifestGone) {
   RunTestOnIOThread(&AppCacheUpdateJobTest::ManifestGoneTest);
 }
@@ skipping 171 matching lines @@
 struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest> {
   void RetainCallee(appcache::AppCacheUpdateJobTest* obj) { }
   void ReleaseCallee(appcache::AppCacheUpdateJobTest* obj) { }
 };
 template<>
 struct RunnableMethodTraits<appcache::AppCacheUpdateJobTest::MockAppCachePolicy>
 {
   void RetainCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { }
   void ReleaseCallee(appcache::AppCacheUpdateJobTest::MockAppCachePolicy* o) { }
 };