ui: Cleanup class/struct forward declarations

net/url_request/url_fetcher_core.h

Index: net/url_request/url_fetcher_core.h
diff --git a/net/url_request/url_fetcher_core.h b/net/url_request/url_fetcher_core.h
index 415badfa323cccbf13e6914efb0954932b669fca..704697a1352ee9c906ce3b561e4f2e1894bc06fb 100644
--- a/net/url_request/url_fetcher_core.h
+++ b/net/url_request/url_fetcher_core.h
@@ -87,12 +87,11 @@ class URLFetcherCore : public base::RefCountedThreadSafe<URLFetcherCore>,
   void SetExtraRequestHeaders(const std::string& extra_request_headers);
   void AddExtraRequestHeader(const std::string& header_line);
   void SetRequestContext(URLRequestContextGetter* request_context_getter);
-  // Set the URL that should be considered as "initiating" the fetch. This URL
+  // Set the origin that should be considered as "initiating" the fetch. This
+  // URL
   // will be considered the "first-party" when applying cookie blocking policy
   // to requests, and treated as the request's initiator.
-  //
-  // TODO(mkwst): Convert this to a url::Origin. https://crbug.com/577565
-  void SetInitiatorURL(const GURL& initiator);
+  void SetInitiator(const base::Optional<url::Origin>& initiator);
   // Set the key and data callback that is used when setting the user
   // data on any URLRequest objects this object creates.
   void SetURLRequestUserData(
@@ -247,7 +246,7 @@ class URLFetcherCore : public base::RefCountedThreadSafe<URLFetcherCore>,
                                      // Read buffer
   scoped_refptr<URLRequestContextGetter> request_context_getter_;
                                      // Cookie/cache info for the request
-  GURL initiator_;  // The request's initiator
+  base::Optional<url::Origin> initiator_;  // The request's initiator
   // The user data to add to each newly-created URLRequest.
   const void* url_request_data_key_;
   URLFetcher::CreateDataCallback url_request_create_data_callback_;