Make ServiceWorkerDatabase::DestroyDatabase() work on in-memory db

content/browser/service_worker/service_worker_context_unittest.cc

 // Copyright 2013 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 "content/public/browser/service_worker_context.h"
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/browser_thread_impl.h"
@@ skipping 321 matching lines @@
       script_url,
       NULL,
       MakeRegisteredCallback(&called, &new_registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
   ASSERT_TRUE(called);
   EXPECT_EQ(old_registration_id, new_registration_id);
 }
 
-// TODO(jmadill): Fix on Windows 8. http://crbug.com/420124
-#if defined(OS_WIN)
-#define MAYBE_DeleteAndStartOver DISABLED_DeleteAndStartOver
-#else
-#define MAYBE_DeleteAndStartOver DeleteAndStartOver
-#endif
-
 // TODO(nhiroki): Test this for on-disk storage.
-TEST_F(ServiceWorkerContextTest, MAYBE_DeleteAndStartOver) {
+TEST_F(ServiceWorkerContextTest, DeleteAndStartOver) {
   int64 registration_id = kInvalidServiceWorkerRegistrationId;
   bool called = false;
   context()->RegisterServiceWorker(
       GURL("http://www.example.com/"),
       GURL("http://www.example.com/service_worker.js"),
       NULL,
       MakeRegisteredCallback(&called, &registration_id));
 
   ASSERT_FALSE(called);
   base::RunLoop().RunUntilIdle();
@@ skipping 55 matching lines @@
                  false /* expect_waiting */,
                  true /* expect_active */));
   base::RunLoop().RunUntilIdle();
 
   // The new context should take over next handle ids.
   EXPECT_EQ(1, context()->GetNewServiceWorkerHandleId());
   EXPECT_EQ(1, context()->GetNewRegistrationHandleId());
 }
 
 }  // namespace content