Reland of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 261 matching lines @@
   ScriptPromise promise = resolver->Promise();
 
   if (!provider_) {
     resolver->Reject(DOMException::Create(kInvalidStateError,
                                           "Failed to register a ServiceWorker: "
                                           "The document is in an invalid "
                                           "state."));
     return promise;
   }
 
-  ExecutionContext* execution_context = script_state->GetExecutionContext();
+  ExecutionContext* execution_context = ExecutionContext::From(script_state);
   // FIXME: May be null due to worker termination: http://crbug.com/413518.
   if (!execution_context)
     return ScriptPromise();
 
   KURL script_url = execution_context->CompleteURL(url);
   script_url.RemoveFragmentIdentifier();
 
   KURL pattern_url;
   if (options.scope().IsNull())
     pattern_url = KURL(script_url, "./");
@@ skipping 16 matching lines @@
   ScriptPromise promise = resolver->Promise();
 
   if (!provider_) {
     resolver->Reject(DOMException::Create(kInvalidStateError,
                                           "Failed to get a "
                                           "ServiceWorkerRegistration: The "
                                           "document is in an invalid state."));
     return promise;
   }
 
-  ExecutionContext* execution_context = script_state->GetExecutionContext();
+  ExecutionContext* execution_context = ExecutionContext::From(script_state);
   // FIXME: May be null due to worker termination: http://crbug.com/413518.
   if (!execution_context)
     return ScriptPromise();
 
   RefPtr<SecurityOrigin> document_origin =
       execution_context->GetSecurityOrigin();
   String error_message;
   if (!execution_context->IsSecureContext(error_message)) {
     resolver->Reject(DOMException::Create(kSecurityError, error_message));
     return promise;
@@ skipping 36 matching lines @@
   ScriptPromise promise = resolver->Promise();
 
   if (!provider_) {
     resolver->Reject(
         DOMException::Create(kInvalidStateError,
                              "Failed to get ServiceWorkerRegistration objects: "
                              "The document is in an invalid state."));
     return promise;
   }
 
-  ExecutionContext* execution_context = script_state->GetExecutionContext();
+  ExecutionContext* execution_context = ExecutionContext::From(script_state);
   RefPtr<SecurityOrigin> document_origin =
       execution_context->GetSecurityOrigin();
   String error_message;
   if (!execution_context->IsSecureContext(error_message)) {
     resolver->Reject(DOMException::Create(kSecurityError, error_message));
     return promise;
   }
 
   KURL page_url = KURL(KURL(), document_origin->ToString());
   if (!SchemeRegistry::ShouldTreatURLSchemeAsAllowingServiceWorkers(
@@ skipping 99 matching lines @@
 
   if (ServiceWorkerContainerClient* client =
           ServiceWorkerContainerClient::From(execution_context)) {
     provider_ = client->Provider();
     if (provider_)
       provider_->SetClient(this);
   }
 }
 
 }  // namespace blink