Modify IPC call to properly record the PLT histograms for LoFi.

chrome/renderer/page_load_histograms.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 "chrome/renderer/page_load_histograms.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 195 matching lines @@
   if (!base::StringToInt(value, &experiment_id))
     return kNoExperiment;
   if (0 < experiment_id && experiment_id <= kMaxExperimentID)
     return experiment_id;
   return kNoExperiment;
 }
 
 void DumpHistograms(const WebPerformance& performance,
                     DocumentState* document_state,
                     bool data_reduction_proxy_was_used,
+                    data_reduction_proxy::AutoLoFiStatus auto_lofi_status,
                     bool came_from_websearch,
                     int websearch_chrome_joint_experiment_id,
                     bool is_preview,
                     URLPattern::SchemeMasks scheme_type) {
   // This function records new histograms based on the Navigation Timing
   // records. As such, the histograms should not depend on the deprecated timing
   // information collected in DocumentState. However, here for some reason we
   // check if document_state->request_time() is null. TODO(ppi): find out why
   // and remove DocumentState from the parameter list.
   Time request = document_state->request_time();
@@ skipping 179 matching lines @@
     if (data_reduction_proxy_was_used) {
       if ((scheme_type & URLPattern::SCHEME_HTTPS) == 0) {
         PLT_HISTOGRAM("PLT.PT_BeginToFinish_DataReductionProxy",
                       load_event_end - begin);
         PLT_HISTOGRAM("PLT.PT_CommitToFinish_DataReductionProxy",
                       load_event_end - response_start);
         PLT_HISTOGRAM("PLT.PT_RequestToFinish_DataReductionProxy",
                       load_event_end - navigation_start);
         PLT_HISTOGRAM("PLT.PT_StartToFinish_DataReductionProxy",
                       load_event_end - request_start);
+        if (auto_lofi_status == data_reduction_proxy::AUTO_LOFI_STATUS_ON) {
+          PLT_HISTOGRAM("PLT.PT_BeginToFinish_DataReductionProxy_AutoLoFiOn",
+                        load_event_end - begin);
+          PLT_HISTOGRAM("PLT.PT_CommitToFinish_DataReductionProxy_AutoLoFiOn",
+                        load_event_end - response_start);
+          PLT_HISTOGRAM("PLT.PT_RequestToFinish_DataReductionProxy_AutoLoFiOn",
+                        load_event_end - navigation_start);
+          PLT_HISTOGRAM("PLT.PT_StartToFinish_DataReductionProxy_AutoLoFiOn",
+                        load_event_end - request_start);
+        } else if (auto_lofi_status ==
+                   data_reduction_proxy::AUTO_LOFI_STATUS_OFF) {
+          PLT_HISTOGRAM("PLT.PT_BeginToFinish_DataReductionProxy_AutoLoFiOff",
+                        load_event_end - begin);
+          PLT_HISTOGRAM("PLT.PT_CommitToFinish_DataReductionProxy_AutoLoFiOff",
+                        load_event_end - response_start);
+          PLT_HISTOGRAM("PLT.PT_RequestToFinish_DataReductionProxy_AutoLoFiOff",
+                        load_event_end - navigation_start);
+          PLT_HISTOGRAM("PLT.PT_StartToFinish_DataReductionProxy_AutoLoFiOff",
+                        load_event_end - request_start);
+        }
       } else {
         PLT_HISTOGRAM("PLT.PT_BeginToFinish_HTTPS_DataReductionProxy",
                       load_event_end - begin);
         PLT_HISTOGRAM("PLT.PT_CommitToFinish_HTTPS_DataReductionProxy",
                       load_event_end - response_start);
         PLT_HISTOGRAM("PLT.PT_RequestToFinish_HTTPS_DataReductionProxy",
                       load_event_end - navigation_start);
         PLT_HISTOGRAM("PLT.PT_StartToFinish_HTTPS_DataReductionProxy",
                       load_event_end - request_start);
+        if (auto_lofi_status == data_reduction_proxy::AUTO_LOFI_STATUS_ON) {
+          PLT_HISTOGRAM(
+              "PLT.PT_BeginToFinish_HTTPS_DataReductionProxy_AutoLoFiOn",
+              load_event_end - begin);
+          PLT_HISTOGRAM(
+              "PLT.PT_CommitToFinish_HTTPS_DataReductionProxy_AutoLoFiOn",
+              load_event_end - response_start);
+          PLT_HISTOGRAM(
+              "PLT.PT_RequestToFinish_HTTPS_DataReductionProxy_AutoLoFiOn",
+              load_event_end - navigation_start);
+          PLT_HISTOGRAM(
+              "PLT.PT_StartToFinish_HTTPS_DataReductionProxy_AutoLoFiOn",
+              load_event_end - request_start);
+        } else if (auto_lofi_status ==
+                   data_reduction_proxy::AUTO_LOFI_STATUS_OFF) {
+          PLT_HISTOGRAM(
+              "PLT.PT_BeginToFinish_HTTPS_DataReductionProxy_AutoLoFiOff",
+              load_event_end - begin);
+          PLT_HISTOGRAM(
+              "PLT.PT_CommitToFinish_HTTPS_DataReductionProxy_AutoLoFiOff",
+              load_event_end - response_start);
+          PLT_HISTOGRAM(
+              "PLT.PT_RequestToFinish_HTTPS_DataReductionProxy_AutoLoFiOff",
+              load_event_end - navigation_start);
+          PLT_HISTOGRAM(
+              "PLT.PT_StartToFinish_HTTPS_DataReductionProxy_AutoLoFiOff",
+              load_event_end - request_start);
+        }
       }
     }
   }
   if (!load_event_start.is_null() && !load_event_end.is_null()) {
     PLT_HISTOGRAM("PLT.PT_FinishDocToFinish",
                   load_event_end - load_event_start);
     PLT_HISTOGRAM_DRP("PLT.NT_LoadEvent",
                       load_event_end - load_event_start,
                       data_reduction_proxy_was_used,
                       scheme_type);
@@ skipping 11 matching lines @@
   if (!dom_content_loaded_start.is_null()) {
     PLT_HISTOGRAM_WITH_GWS_VARIANT("PLT.PT_RequestToDomContentLoaded",
                                    dom_content_loaded_start - navigation_start,
                                    came_from_websearch,
                                    websearch_chrome_joint_experiment_id,
                                    is_preview);
     if (data_reduction_proxy_was_used) {
       if ((scheme_type & URLPattern::SCHEME_HTTPS) == 0) {
         PLT_HISTOGRAM("PLT.PT_RequestToDomContentLoaded_DataReductionProxy",
                       dom_content_loaded_start - navigation_start);
+        if (auto_lofi_status == data_reduction_proxy::AUTO_LOFI_STATUS_ON) {
+          PLT_HISTOGRAM(
+              "PLT.PT_RequestToDomContentLoaded_DataReductionProxy_AutoLoFiOn",
+              dom_content_loaded_start - navigation_start);
+        } else if (auto_lofi_status ==
+                   data_reduction_proxy::AUTO_LOFI_STATUS_OFF) {
+          PLT_HISTOGRAM(
+              "PLT.PT_RequestToDomContentLoaded_DataReductionProxy_AutoLoFiOff",
+              dom_content_loaded_start - navigation_start);
+        }
       } else {
         PLT_HISTOGRAM(
             "PLT.PT_RequestToDomContentLoaded_HTTPS_DataReductionProxy",
             dom_content_loaded_start - navigation_start);
+        if (auto_lofi_status == data_reduction_proxy::AUTO_LOFI_STATUS_ON) {
+          PLT_HISTOGRAM(
+              "PLT.PT_RequestToDomContentLoaded_HTTPS_DataReductionProxy_"
+              "AutoLoFiOn",
+              dom_content_loaded_start - navigation_start);
+        } else if (auto_lofi_status ==
+                   data_reduction_proxy::AUTO_LOFI_STATUS_OFF) {
+          PLT_HISTOGRAM(
+              "PLT.PT_RequestToDomContentLoaded_HTTPS_DataReductionProxy_"
+              "AutoLoFiOff",
+              dom_content_loaded_start - navigation_start);
+        }
       }
     }
   }
   PLT_HISTOGRAM_WITH_GWS_VARIANT("PLT.PT_BeginToCommit",
                                  response_start - begin,
                                  came_from_websearch,
                                  websearch_chrome_joint_experiment_id,
                                  is_preview);
   PLT_HISTOGRAM_WITH_GWS_VARIANT("PLT.PT_RequestToStart",
                                  request_start - navigation_start,
@@ skipping 276 matching lines @@
     return;
 
   // Ignore multipart requests.
   if (frame->dataSource()->response().isMultipartPayload())
     return;
 
   DocumentState* document_state =
       DocumentState::FromDataSource(frame->dataSource());
 
   bool data_reduction_proxy_was_used = false;
+  enum data_reduction_proxy::AutoLoFiStatus auto_lofi_status =

[jeremyim, 2015/05/13 23:12:08]

Remove enum keyword.

[tbansal1, 2015/05/13 23:51:39]

Done.

+      data_reduction_proxy::AUTO_LOFI_STATUS_DISABLED;
   if (!document_state->proxy_server().IsEmpty()) {
-    Send(new DataReductionProxyViewHostMsg_IsDataReductionProxy(
-        document_state->proxy_server(), &data_reduction_proxy_was_used));
+    Send(new DataReductionProxyViewHostMsg_DataReductionProxyStatus(
+        document_state->proxy_server(), &data_reduction_proxy_was_used,
+        &auto_lofi_status));
   }
 
   bool came_from_websearch =
       IsFromGoogleSearchResult(frame->document().url(),
                                GURL(frame->document().referrer()));
   int websearch_chrome_joint_experiment_id = kNoExperiment;
   bool is_preview = false;
   if (came_from_websearch) {
     websearch_chrome_joint_experiment_id =
         GetQueryStringBasedExperiment(GURL(frame->document().referrer()));
     is_preview = ViaHeaderContains(frame, "1.1 Google Instant Proxy Preview");
   }
 
   // Metrics based on the timing information recorded for the Navigation Timing
   // API - http://www.w3.org/TR/navigation-timing/.
   DumpHistograms(frame->performance(), document_state,
-                 data_reduction_proxy_was_used,
-                 came_from_websearch,
-                 websearch_chrome_joint_experiment_id,
-                 is_preview,
-                 scheme_type);
+                 data_reduction_proxy_was_used, auto_lofi_status,
+                 came_from_websearch, websearch_chrome_joint_experiment_id,
+                 is_preview, scheme_type);
 
   // Old metrics based on the timing information stored in DocumentState. These
   // are deprecated and should go away.
   DumpDeprecatedHistograms(frame->performance(), document_state,
                            data_reduction_proxy_was_used,
                            came_from_websearch,
                            websearch_chrome_joint_experiment_id,
                            is_preview,
                            scheme_type);
 
@@ skipping 32 matching lines @@
 
   DCHECK(document_state);
   DCHECK(ds);
   GURL url(ds->request().url());
   Time start = document_state->start_load_time();
   Time finish = document_state->finish_load_time();
   // TODO(mbelshe): should we log more stats?
   VLOG(1) << "PLT: " << (finish - start).InMilliseconds() << "ms "
           << url.spec();
 }