Revert "Create ServiceWorkerProviderHost before starting worker"

content/browser/service_worker/service_worker_context_request_handler_unittest.cc

 // Copyright 2014 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/browser/service_worker/service_worker_context_request_handler.h"
 
 #include <utility>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
@@ skipping 72 matching lines @@
     version_ = nullptr;
     registration_ = nullptr;
     helper_.reset();
   }
 
   ServiceWorkerContextCore* context() const { return helper_->context(); }
 
   void SetUpProvider() {
     std::unique_ptr<ServiceWorkerProviderHost> host =
         CreateProviderHostForServiceWorkerContext(
-            helper_->mock_render_process_id(),
-            true /* is_parent_frame_secure */, version_.get(),
-            context()->AsWeakPtr(), &remote_endpoint_);
+            helper_->mock_render_process_id(), 1 /* provider_id */,
+            true /* is_parent_frame_secure */, context()->AsWeakPtr(),
+            &remote_endpoint_);
     provider_host_ = host->AsWeakPtr();
     context()->AddProviderHost(std::move(host));
+    provider_host_->running_hosted_version_ = version_;
   }
 
   std::unique_ptr<net::URLRequest> CreateRequest(const GURL& url) {
     return url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY,
                                               &url_request_delegate_,
                                               TRAFFIC_ANNOTATION_FOR_TESTS);
   }
 
   // Creates a ServiceWorkerContextHandler directly.
   std::unique_ptr<ServiceWorkerContextRequestHandler> CreateHandler(
@@ skipping 324 matching lines @@
     EXPECT_EQ(net::ERR_FAILED, url_request_delegate_.request_status());
     histograms.ExpectUniqueSample(
         "ServiceWorker.ContextRequestHandlerStatus.NewWorker.MainScript",
         static_cast<int>(ServiceWorkerContextRequestHandler::CreateJobStatus::
                              ERROR_NO_CONTEXT),
         1);
   }
 }
 
 }  // namespace content