Split JobController count histograms into three separate histograms:

net/http/http_stream_factory_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 "net/http/http_stream_factory_impl.h"
 
 #include <string>
 #include <tuple>
 
 #include "base/logging.h"
@@ skipping 354 matching lines @@
       job_controller_set_.size() <= last_logged_job_controller_count_) {
     return;
   }
   last_logged_job_controller_count_ = job_controller_set_.size();
 
   UMA_HISTOGRAM_COUNTS_1M("Net.JobControllerSet.CountOfJobController",
                           job_controller_set_.size());
 
   int alt_job_count = 0;
   int main_job_count = 0;
-  int pending_request_count = 0;
-  int preconnect_controller_count = 0;
+  size_t num_controllers_with_request = 0;
+  size_t num_controllers_for_preconnect = 0;
   for (const auto& job_controller : job_controller_set_) {
     DCHECK(job_controller->HasPendingAltJob() ||
            job_controller->HasPendingMainJob());
     // Additionally logs the states of the jobs if there are at least 500
     // controllers, which suggests that there might be a leak.
     if (job_controller_set_.size() >= 500)
       job_controller->LogHistograms();
     // For a preconnect controller, it should have exactly the main job.
     if (job_controller->is_preconnect()) {
-      preconnect_controller_count++;
+      num_controllers_for_preconnect++;
       continue;
     }
     // For non-preconnects.
     if (job_controller->HasPendingRequest())
-      pending_request_count++;
+      num_controllers_with_request++;
     if (job_controller->HasPendingAltJob())
       alt_job_count++;
     if (job_controller->HasPendingMainJob())
       main_job_count++;
   }
-  UMA_HISTOGRAM_COUNTS_1M("Net.JobControllerSet.CountOfPreconnect",
-                          preconnect_controller_count);
+  DCHECK_GE(job_controller_set_.size(), num_controllers_for_preconnect);

[xunjieli, 2017/04/19 17:50:04]

I think this is redundant -- we are only incrementing
num_controllers_for_preconnect while iterating job_controller_set_.

[Zhongyi Shi, 2017/04/19 18:43:51]

Alright, let's get rid of all those DCHECKs. 

+  UMA_HISTOGRAM_COUNTS_1M(
+      "Net.JobControllerSet.CountOfJobController.Preconnect",
+      num_controllers_for_preconnect);
+  UMA_HISTOGRAM_COUNTS_1M(
+      "Net.JobControllerSet.CountOfJobController.NonPreconnect.PendingRequest",
+      num_controllers_with_request);
+
+  DCHECK_GE(job_controller_set_.size() - num_controllers_for_preconnect,
+            num_controllers_with_request);
+  UMA_HISTOGRAM_COUNTS_1M(
+      "Net.JobControllerSet.CountOfJobController.NonPreconnect.RequestGone",
+      job_controller_set_.size() - num_controllers_for_preconnect -
+          num_controllers_with_request);
+
   UMA_HISTOGRAM_COUNTS_1M("Net.JobControllerSet.CountOfNonPreconnectAltJob",
                           alt_job_count);
   UMA_HISTOGRAM_COUNTS_1M("Net.JobControllerSet.CountOfNonPreconnectMainJob",
                           main_job_count);
-  UMA_HISTOGRAM_COUNTS_1M("Net.JobControllerSet.CountOfPendingRequest",
-                          pending_request_count);
 }
 
 void HttpStreamFactoryImpl::DumpMemoryStats(
     base::trace_event::ProcessMemoryDump* pmd,
     const std::string& parent_absolute_name) const {
   if (job_controller_set_.empty())
     return;
   std::string name =
       base::StringPrintf("%s/stream_factory", parent_absolute_name.c_str());
   base::trace_event::MemoryAllocatorDump* factory_dump =
       pmd->CreateAllocatorDump(name);
   size_t alt_job_count = 0;
   size_t main_job_count = 0;
-  size_t preconnect_controller_count = 0;
+  size_t num_controllers_for_preconnect = 0;
   for (const auto& it : job_controller_set_) {
     // For a preconnect controller, it should have exactly the main job.
     if (it->is_preconnect()) {
-      preconnect_controller_count++;
+      num_controllers_for_preconnect++;
       continue;
     }
     // For non-preconnects.
     if (it->HasPendingAltJob())
       alt_job_count++;
     if (it->HasPendingMainJob())
       main_job_count++;
   }
   factory_dump->AddScalar(
       base::trace_event::MemoryAllocatorDump::kNameSize,
       base::trace_event::MemoryAllocatorDump::kUnitsBytes,
       base::trace_event::EstimateMemoryUsage(job_controller_set_));
   factory_dump->AddScalar(
       base::trace_event::MemoryAllocatorDump::kNameObjectCount,
       base::trace_event::MemoryAllocatorDump::kUnitsObjects,
       job_controller_set_.size());
   // The number of non-preconnect controllers with a pending alt job.
   factory_dump->AddScalar("alt_job_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                           alt_job_count);
   // The number of non-preconnect controllers with a pending main job.
   factory_dump->AddScalar("main_job_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
                           main_job_count);
   // The number of preconnect controllers.
   factory_dump->AddScalar("preconnect_count",
                           base::trace_event::MemoryAllocatorDump::kUnitsObjects,
-                          preconnect_controller_count);
+                          num_controllers_for_preconnect);
 }
 
 }  // namespace net