Add the UMA PLT.BeginToFinish{,Doc}_AfterPreconnectRequest

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 3969 matching lines @@
 
 void RenderViewImpl::didUpdateCurrentHistoryItem(WebFrame* frame) {
   StartNavStateSyncTimerIfNecessary();
 }
 
 void RenderViewImpl::assignIdentifierToRequest(
     WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
   // Ignore
 }
 
+void RenderViewImpl::willRequestAfterPreconnect(WebFrame* frame,
+                                                WebURLRequest& request) {
+  WebKit::WebReferrerPolicy referrer_policy = WebKit::WebReferrerPolicyDefault;
+  WebString custom_user_agent;
+
+  if(request.extraData()) {

[jam, 2013/07/26 04:59:39]

nit: "if ("

[kouhei (in TOK), 2013/07/26 10:50:02]

Done.

+    // This will only be called before willSendRequest, so only ExtraData
+    // members we have to copy here is on WebURLRequestExtraDataImpl.
+    webkit_glue::WebURLRequestExtraDataImpl* old_extra_data =
+        static_cast<webkit_glue::WebURLRequestExtraDataImpl*>(
+            request.extraData());
+
+    referrer_policy = old_extra_data->referrer_policy();
+    custom_user_agent = old_extra_data->custom_user_agent();
+  }
+
+  bool was_after_preconnect_request = true;
+  // The args after |was_after_preconnect_request| are not used, and set to
+  // correct values at |willSendRequest|.
+  request.setExtraData(new webkit_glue::WebURLRequestExtraDataImpl(
+      referrer_policy, custom_user_agent, was_after_preconnect_request));
+}
+
 void RenderViewImpl::willSendRequest(WebFrame* frame,
                                      unsigned identifier,
                                      WebURLRequest& request,
                                      const WebURLResponse& redirect_response) {
   // The request my be empty during tests.
   if (request.url().isEmpty())
     return;
 
   WebFrame* top_frame = frame->top();
   if (!top_frame)
@@ skipping 30 matching lines @@
     referrer_policy = internal_data->referrer_policy();
     internal_data->clear_referrer_policy();
   } else {
     referrer_policy = frame->document().referrerPolicy();
   }
 
   // The request's extra data may indicate that we should set a custom user
   // agent. This needs to be done here, after WebKit is through with setting the
   // user agent on its own.
   WebString custom_user_agent;
+  bool was_after_preconnect_request = false;
   if (request.extraData()) {
     webkit_glue::WebURLRequestExtraDataImpl* old_extra_data =
         static_cast<webkit_glue::WebURLRequestExtraDataImpl*>(
             request.extraData());
     custom_user_agent = old_extra_data->custom_user_agent();
+    was_after_preconnect_request =
+        old_extra_data->was_after_preconnect_request();
 
     if (!custom_user_agent.isNull()) {
       if (custom_user_agent.isEmpty())
         request.clearHTTPHeaderField("User-Agent");
       else
         request.setHTTPHeaderField("User-Agent", custom_user_agent);
     }
   }
 
   request.setExtraData(
       new RequestExtraData(referrer_policy,
                            custom_user_agent,
+                           was_after_preconnect_request,
                            (frame == top_frame),
                            frame->identifier(),
                            frame->parent() == top_frame,
                            frame->parent() ? frame->parent()->identifier() : -1,
                            navigation_state->allow_download(),
                            transition_type,
                            navigation_state->transferred_request_child_id(),
                            navigation_state->transferred_request_request_id()));
 
   DocumentState* top_document_state =
       DocumentState::FromDataSource(top_data_source);
-  // TODO(gavinp): separate out prefetching and prerender field trials
-  // if the rel=prerender rel type is sticking around.
-  if (top_document_state &&
-      request.targetType() == WebURLRequest::TargetIsPrefetch)
-    top_document_state->set_was_prefetcher(true);
+  if (top_document_state) {
+    // TODO(gavinp): separate out prefetching and prerender field trials
+    // if the rel=prerender rel type is sticking around.
+    if(request.targetType() == WebURLRequest::TargetIsPrefetch)

[jam, 2013/07/26 04:59:39]

ditto and also below

[kouhei (in TOK), 2013/07/26 10:50:02]

Done.

+      top_document_state->set_was_prefetcher(true);
+
+    if(was_after_preconnect_request)
+      top_document_state->set_was_after_preconnect_request(true);
+  }
 
   request.setRequestorID(routing_id_);
   request.setHasUserGesture(WebUserGestureIndicator::isProcessingUserGesture());
 
   if (!navigation_state->extra_headers().empty()) {
     for (net::HttpUtil::HeadersIterator i(
         navigation_state->extra_headers().begin(),
         navigation_state->extra_headers().end(), "\n");
         i.GetNext(); ) {
       request.setHTTPHeaderField(WebString::fromUTF8(i.name()),
@@ skipping 2656 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content