Avoid duplicate functions/code in core/inspector.

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
index 7cf1b65eebb3b03c555aeeb82ec524c55b1fa589..83f4d89ed04b9ccb26d81c091d03d17e548a78d5 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
@@ -207,12 +207,6 @@ class InspectorFileReaderLoaderClient final : public FileReaderLoaderClient {
   RefPtr<SharedBuffer> raw_data_;
 };
 
-KURL UrlWithoutFragment(const KURL& url) {
-  KURL result = url;
-  result.RemoveFragmentIdentifier();
-  return result;
-}
-
 String MixedContentTypeForContextType(WebMixedContentContextType context_type) {
   switch (context_type) {
     case WebMixedContentContextType::kNotMixedContent:
@@ -360,9 +354,11 @@ static std::unique_ptr<protocol::Network::ResourceTiming> BuildObjectForTiming(
 
 static std::unique_ptr<protocol::Network::Request>
 BuildObjectForResourceRequest(const ResourceRequest& request) {
+  KURL nofragment_request_url(request.Url());
+  nofragment_request_url.RemoveFragmentIdentifier();
   std::unique_ptr<protocol::Network::Request> request_object =
       protocol::Network::Request::create()
-          .setUrl(UrlWithoutFragment(request.Url()).GetString())
+          .setUrl(nofragment_request_url.GetString())
           .setMethod(request.HttpMethod())
           .setHeaders(BuildObjectForHeaders(request.HttpHeaderFields()))
           .setInitialPriority(ResourcePriorityJSON(request.Priority()))
@@ -430,9 +426,11 @@ BuildObjectForResourceResponse(const ResourceResponse& response,
   if (is_empty)
     *is_empty = !status && mime_type.IsEmpty() && !headers_map.size();
 
+  KURL nofragment_response_url(response.Url());
+  nofragment_response_url.RemoveFragmentIdentifier();
   std::unique_ptr<protocol::Network::Response> response_object =
       protocol::Network::Response::create()
-          .setUrl(UrlWithoutFragment(response.Url()).GetString())
+          .setUrl(nofragment_response_url.GetString())
           .setStatus(status)
           .setStatusText(status_text)
           .setHeaders(BuildObjectForHeaders(headers_map))
@@ -659,9 +657,10 @@ void InspectorNetworkAgent::WillSendRequestInternal(
     request_info->setIsLinkPreload(true);
 
   String resource_type = InspectorPageAgent::ResourceTypeJson(type);
-  String documentURL =
-      loader ? UrlWithoutFragment(loader->Url()).GetString()
-             : UrlWithoutFragment(execution_context->Url()).GetString();
+  KURL nofragment_document_url(loader ? loader->Url()
+                                      : execution_context->Url());
+  nofragment_document_url.RemoveFragmentIdentifier();
+  String documentURL = nofragment_document_url.GetString();
   Maybe<String> maybe_frame_id;
   if (!frame_id.IsEmpty())
     maybe_frame_id = frame_id;
@@ -947,9 +946,11 @@ void InspectorNetworkAgent::WillLoadXHR(XMLHttpRequest* xhr,
   DCHECK(!pending_request_);
   pending_request_ = client;
   pending_request_type_ = InspectorPageAgent::kXHRResource;
-  pending_xhr_replay_data_ = XHRReplayData::Create(
-      xhr->GetExecutionContext(), method, UrlWithoutFragment(url), async,
-      form_data.Get(), include_credentials);
+  KURL nofragment_url(url);
+  nofragment_url.RemoveFragmentIdentifier();
+  pending_xhr_replay_data_ =
+      XHRReplayData::Create(xhr->GetExecutionContext(), method, nofragment_url,
+                            async, form_data.Get(), include_credentials);
   for (const auto& header : headers)
     pending_xhr_replay_data_->AddHeader(header.key, header.value);
 }
@@ -1102,7 +1103,9 @@ InspectorNetworkAgent::BuildInitiatorObject(
         protocol::Network::Initiator::create()
             .setType(protocol::Network::Initiator::TypeEnum::Parser)
             .build();
-    initiator_object->setUrl(UrlWithoutFragment(document->Url()).GetString());
+    KURL nofragment_document_url(document->Url());
+    nofragment_document_url.RemoveFragmentIdentifier();
+    initiator_object->setUrl(nofragment_document_url.GetString());
     if (TextPosition::BelowRangePosition() != initiator_info.position)
       initiator_object->setLineNumber(
           initiator_info.position.line_.ZeroBasedInt());
@@ -1124,10 +1127,11 @@ void InspectorNetworkAgent::DidCreateWebSocket(Document* document,
   std::unique_ptr<v8_inspector::protocol::Runtime::API::StackTrace>
       current_stack_trace =
           SourceLocation::Capture(document)->BuildInspectorObject();
+  KURL nofragment_request_url(request_url);
+  nofragment_request_url.RemoveFragmentIdentifier();
   if (!current_stack_trace) {
-    GetFrontend()->webSocketCreated(
-        IdentifiersFactory::RequestId(identifier),
-        UrlWithoutFragment(request_url).GetString());
+    GetFrontend()->webSocketCreated(IdentifiersFactory::RequestId(identifier),
+                                    nofragment_request_url.GetString());
     return;
   }
 
@@ -1137,7 +1141,7 @@ void InspectorNetworkAgent::DidCreateWebSocket(Document* document,
           .build();
   initiator_object->setStack(std::move(current_stack_trace));
   GetFrontend()->webSocketCreated(IdentifiersFactory::RequestId(identifier),
-                                  UrlWithoutFragment(request_url).GetString(),
+                                  nofragment_request_url.GetString(),
                                   std::move(initiator_object));
 }