PlzNavigate: Fix ServiceWorkerHandler not finding WebContents.

content/browser/service_worker/service_worker_context_observer.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_OBSERVER_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_OBSERVER_H_
 
 #include <stdint.h>
 
+#include "base/callback.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "content/browser/service_worker/service_worker_info.h"
 #include "content/browser/service_worker/service_worker_version.h"
 #include "url/gurl.h"
 
 namespace content {
 
 enum class EmbeddedWorkerStatus;
 
@@ skipping 44 matching lines @@
       int64_t version_id,
       base::Time script_response_time,
       base::Time script_last_modified) {}
   virtual void OnErrorReported(int64_t version_id,
                                int process_id,
                                int thread_id,
                                const ErrorInfo& info) {}
   virtual void OnReportConsoleMessage(int64_t version_id,
                                       int process_id,
                                       int thread_id,
                                       const ConsoleMessage& message) {}

[falken, 2017/06/01 07:37:27]

Should we say:

// |web_contents_getter| is only set in PlzNavigate.

[arthursonzogni, 2017/06/01 08:14:08]

Done.

-  virtual void OnControlleeAdded(int64_t version_id,
-                                 const std::string& uuid,
-                                 int process_id,
-                                 int route_id,
-                                 ServiceWorkerProviderType type) {}
+  virtual void OnControlleeAdded(
+      int64_t version_id,
+      const std::string& uuid,
+      int process_id,
+      int route_id,
+      const base::Callback<WebContents*(void)>& web_contents_getter,
+      ServiceWorkerProviderType type) {}
   virtual void OnControlleeRemoved(int64_t version_id,
                                    const std::string& uuid) {}
   virtual void OnRegistrationStored(int64_t registration_id,
                                     const GURL& pattern) {}
   virtual void OnRegistrationDeleted(int64_t registration_id,
                                      const GURL& pattern) {}
 
   // Notified when the storage corruption recovery is completed and all stored
   // data is wiped out.
   virtual void OnStorageWiped() {}
 
  protected:
   virtual ~ServiceWorkerContextObserver() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CONTEXT_OBSERVER_H_