[ServiceWorker] Add WebDataSource argument to isControlledByServiceWorker() [2/3 chromium]

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index f4b43b7de2347ce3adc1e983e32ef94345b8aefa..1c79957bb38c13b90c1f31c19dcdc9035854b7c6 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3172,18 +3172,10 @@ blink::WebScreenOrientationClient*
   return screen_orientation_dispatcher_;
 }
 
-bool RenderFrameImpl::isControlledByServiceWorker() {
-  // If we're in the middle of committing a load, the data source we need
-  // will still be provisional.
-  DCHECK(frame_);
-  WebDataSource* data_source = NULL;
-  if (frame_->provisionalDataSource())
-    data_source = frame_->provisionalDataSource();
-  else
-    data_source = frame_->dataSource();
+bool RenderFrameImpl::isControlledByServiceWorker(WebDataSource& data_source) {
   ServiceWorkerNetworkProvider* provider =
       ServiceWorkerNetworkProvider::FromDocumentState(
-          DocumentState::FromDataSource(data_source));
+          DocumentState::FromDataSource(&data_source));
   return provider->context()->controller_handle_id() !=
       kInvalidServiceWorkerHandleId;
 }