Revert of service worker: use 200 OK for update requests even in the no update case

third_party/WebKit/Source/web/WebEmbeddedWorkerImplTest.cpp

 // Copyright 2015 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 "public/web/WebEmbeddedWorker.h"
 
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLResponse.h"
@@ skipping 29 matching lines @@
 
         WebURL scriptURL = URLTestHelpers::toKURL("https://www.example.com/sw.js");
         WebURLResponse response;
         response.initialize();
         response.setMIMEType("text/javascript");
         response.setHTTPStatusCode(200);
         Platform::current()->unitTestSupport()->registerMockedURL(scriptURL, response, "");
 
         m_startData.scriptURL = scriptURL;
         m_startData.userAgent = WebString("dummy user agent");
-        m_startData.pauseAfterDownloadMode = WebEmbeddedWorkerStartData::DontPauseAfterDownload;
         m_startData.waitForDebuggerMode = WebEmbeddedWorkerStartData::DontWaitForDebugger;
         m_startData.v8CacheOptions = WebSettings::V8CacheOptionsDefault;
     }
 
     void TearDown() override
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
     }
 
     WebEmbeddedWorkerStartData m_startData;
@@ skipping 36 matching lines @@
     EXPECT_CALL(*m_mockClient, createServiceWorkerNetworkProvider(::testing::_)).WillOnce(::testing::Return(nullptr));
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
 
     // Terminate before loading the script.
     EXPECT_CALL(*m_mockClient, workerContextFailedToStart()).Times(1);
     m_worker->terminateWorkerContext();
     ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
 }
 
-TEST_F(WebEmbeddedWorkerImplTest, TerminateWhilePausedAfterDownload)
-{
-    EXPECT_CALL(*m_mockClient, workerReadyForInspection())
-        .Times(1);
-    m_startData.pauseAfterDownloadMode = WebEmbeddedWorkerStartData::PauseAfterDownload;
-    m_worker->startWorkerContext(m_startData);
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-
-    // Load the shadow page.
-    EXPECT_CALL(*m_mockClient, createServiceWorkerNetworkProvider(::testing::_))
-        .WillOnce(::testing::Return(nullptr));
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-
-    // Load the script.
-    EXPECT_CALL(*m_mockClient, workerScriptLoaded())
-        .Times(1);
-    EXPECT_CALL(*m_mockClient, createServiceWorkerProvider())
-        .Times(0);
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-
-    // Terminate before resuming after download.
-    EXPECT_CALL(*m_mockClient, createServiceWorkerProvider())
-        .Times(0);
-    EXPECT_CALL(*m_mockClient, workerContextFailedToStart())
-        .Times(1);
-    m_worker->terminateWorkerContext();
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-}
-
 TEST_F(WebEmbeddedWorkerImplTest, ScriptNotFound)
 {
     WebURL scriptURL = URLTestHelpers::toKURL("https://www.example.com/sw-404.js");
     WebURLResponse response;
     response.initialize();
     response.setMIMEType("text/javascript");
     response.setHTTPStatusCode(404);
     WebURLError error;
     error.reason = 1010;
     error.domain = "WebEmbeddedWorkerImplTest";
@@ skipping 15 matching lines @@
     EXPECT_CALL(*m_mockClient, workerScriptLoaded())
         .Times(0);
     EXPECT_CALL(*m_mockClient, createServiceWorkerProvider())
         .Times(0);
     EXPECT_CALL(*m_mockClient, workerContextFailedToStart())
         .Times(1);
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
 }
 
-// The running worker is detected as a memory leak. crbug.com/586897
 #if defined(ADDRESS_SANITIZER)
-#define MAYBE_DontPauseAfterDownload DISABLED_DontPauseAfterDownload
+#define MAYBE_Success DISABLED_Success
 #else
-#define MAYBE_DontPauseAfterDownload DontPauseAfterDownload
+#define MAYBE_Success Success
 #endif
 
-TEST_F(WebEmbeddedWorkerImplTest, DontPauseAfterDownload)
+TEST_F(WebEmbeddedWorkerImplTest, MAYBE_Success)
 {
     EXPECT_CALL(*m_mockClient, workerReadyForInspection())
         .Times(1);
     m_worker->startWorkerContext(m_startData);
     ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
 
     // Load the shadow page.
     EXPECT_CALL(*m_mockClient, createServiceWorkerNetworkProvider(::testing::_))
         .WillOnce(::testing::Return(nullptr));
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
 
     // Load the script.
     EXPECT_CALL(*m_mockClient, workerScriptLoaded())
         .Times(1);
     EXPECT_CALL(*m_mockClient, createServiceWorkerProvider())
         .WillOnce(::testing::Return(nullptr));
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
 }
 
-// The running worker is detected as a memory leak. crbug.com/586897
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_PauseAfterDownload DISABLED_PauseAfterDownload
-#else
-#define MAYBE_PauseAfterDownload PauseAfterDownload
-#endif
-
-TEST_F(WebEmbeddedWorkerImplTest, PauseAfterDownload)
-{
-    EXPECT_CALL(*m_mockClient, workerReadyForInspection())
-        .Times(1);
-    m_startData.pauseAfterDownloadMode = WebEmbeddedWorkerStartData::PauseAfterDownload;
-    m_worker->startWorkerContext(m_startData);
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-
-    // Load the shadow page.
-    EXPECT_CALL(*m_mockClient, createServiceWorkerNetworkProvider(::testing::_))
-        .WillOnce(::testing::Return(nullptr));
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-
-    // Load the script.
-    EXPECT_CALL(*m_mockClient, workerScriptLoaded())
-        .Times(1);
-    EXPECT_CALL(*m_mockClient, createServiceWorkerProvider())
-        .Times(0);
-    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-
-    // Resume after download.
-    EXPECT_CALL(*m_mockClient, createServiceWorkerProvider())
-        .WillOnce(::testing::Return(nullptr));
-    m_worker->resumeAfterDownload();
-    ::testing::Mock::VerifyAndClearExpectations(m_mockClient);
-}
-
 } // namespace blink