Stop FetchClientSettingsObject::GetAddressSpace from returning optional

Bug: 914739
Change-Id: I95cc0ecfa16624e16aff17097e9587ecd4756dfb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1524394
Auto-Submit: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Hiroki Nakagawa <nhiroki@chromium.org>
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Cr-Commit-Position: refs/heads/master@{#641117}

third_party/blink/renderer/core/loader/base_fetch_context.cc

@@ -139,9 +139,8 @@ void BaseFetchContext::AddAdditionalRequestHeaders(ResourceRequest& request) {
         request.HttpReferrer());
   }
 
-  auto address_space = fetch_client_settings_object.GetAddressSpace();
-  if (address_space)
-    request.SetExternalRequestStateFromRequestorAddressSpace(*address_space);
+  request.SetExternalRequestStateFromRequestorAddressSpace(
+      fetch_client_settings_object.GetAddressSpace());
 
   scoped_refptr<SecurityOrigin> url_origin =
       SecurityOrigin::Create(request.Url());

third_party/blink/renderer/core/script/fetch_client_settings_object_impl.cc

@@ -67,8 +67,7 @@ FetchClientSettingsObjectImpl::MimeTypeCheckForClassicWorkerScript() const {
   return AllowedByNosniff::MimeTypeCheck::kStrict;
 }
 
-base::Optional<mojom::IPAddressSpace>
-FetchClientSettingsObjectImpl::GetAddressSpace() const {
+mojom::IPAddressSpace FetchClientSettingsObjectImpl::GetAddressSpace() const {
   return execution_context_->GetSecurityContext().AddressSpace();
 }
 

third_party/blink/renderer/core/script/fetch_client_settings_object_impl.h

@@ -42,7 +42,7 @@ class CORE_EXPORT FetchClientSettingsObjectImpl final
   AllowedByNosniff::MimeTypeCheck MimeTypeCheckForClassicWorkerScript()
       const override;
 
-  base::Optional<mojom::IPAddressSpace> GetAddressSpace() const override;
+  mojom::IPAddressSpace GetAddressSpace() const override;
 
   void Trace(Visitor* visitor) override;
 

third_party/blink/renderer/platform/loader/fetch/fetch_client_settings_object.h

@@ -76,9 +76,7 @@ class PLATFORM_EXPORT FetchClientSettingsObject
       const = 0;
 
   // https://wicg.github.io/cors-rfc1918/#address-space
-  // TODO(yhirano): Make this non-Optional when https://crbug.com/855189 is
-  // fixed.
-  virtual base::Optional<mojom::IPAddressSpace> GetAddressSpace() const = 0;
+  virtual mojom::IPAddressSpace GetAddressSpace() const = 0;
 
   virtual void Trace(Visitor*) {}
 };

third_party/blink/renderer/platform/loader/fetch/fetch_client_settings_object_snapshot.cc

@@ -40,7 +40,7 @@ FetchClientSettingsObjectSnapshot::FetchClientSettingsObjectSnapshot(
     const String& outgoing_referrer,
     HttpsState https_state,
     AllowedByNosniff::MimeTypeCheck mime_type_check_for_classic_worker_script,
-    base::Optional<mojom::IPAddressSpace> address_space)
+    mojom::IPAddressSpace address_space)
     : global_object_url_(global_object_url),
       base_url_(base_url),
       security_origin_(std::move(security_origin)),

third_party/blink/renderer/platform/loader/fetch/fetch_client_settings_object_snapshot.h

@@ -34,7 +34,7 @@ struct CrossThreadFetchClientSettingsObjectData {
       String outgoing_referrer,
       HttpsState https_state,
       AllowedByNosniff::MimeTypeCheck mime_type_check_for_classic_worker_script,
-      base::Optional<mojom::IPAddressSpace> address_space)
+      mojom::IPAddressSpace address_space)
       : global_object_url(std::move(global_object_url)),
         base_url(std::move(base_url)),
         security_origin(std::move(security_origin)),
@@ -53,7 +53,7 @@ struct CrossThreadFetchClientSettingsObjectData {
   const HttpsState https_state;
   const AllowedByNosniff::MimeTypeCheck
       mime_type_check_for_classic_worker_script;
-  const base::Optional<mojom::IPAddressSpace> address_space;
+  const mojom::IPAddressSpace address_space;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrossThreadFetchClientSettingsObjectData);
@@ -83,7 +83,7 @@ class PLATFORM_EXPORT FetchClientSettingsObjectSnapshot final
       const String& outgoing_referrer,
       HttpsState https_state,
       AllowedByNosniff::MimeTypeCheck,
-      base::Optional<mojom::IPAddressSpace> address_space);
+      mojom::IPAddressSpace address_space);
 
   ~FetchClientSettingsObjectSnapshot() override = default;
 
@@ -100,7 +100,7 @@ class PLATFORM_EXPORT FetchClientSettingsObjectSnapshot final
   }
   HttpsState GetHttpsState() const override { return https_state_; }
 
-  base::Optional<mojom::IPAddressSpace> GetAddressSpace() const override {
+  mojom::IPAddressSpace GetAddressSpace() const override {
     return address_space_;
   }
 
@@ -127,7 +127,7 @@ class PLATFORM_EXPORT FetchClientSettingsObjectSnapshot final
   const HttpsState https_state_;
   const AllowedByNosniff::MimeTypeCheck
       mime_type_check_for_classic_worker_script_;
-  const base::Optional<mojom::IPAddressSpace> address_space_;
+  mojom::IPAddressSpace address_space_;
 };
 
 }  // namespace blink