Add network quality change events to net log

net/nqe/network_quality_estimator_test_util.cc

 // Copyright 2016 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/nqe/network_quality_estimator_test_util.h"
 
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "net/base/load_flags.h"
+#include "net/log/net_log_with_source.h"
+#include "net/log/test_net_log.h"
+#include "net/log/test_net_log_entry.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 
 namespace {
 
 const base::FilePath::CharType kTestFilePath[] =
     FILE_PATH_LITERAL("net/data/url_request_unittest");
 
 }  // namespace
 
 namespace net {
 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator()
     : TestNetworkQualityEstimator(std::map<std::string, std::string>()) {}
 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator(
     const std::map<std::string, std::string>& variation_params)
     : TestNetworkQualityEstimator(variation_params,
                                   std::unique_ptr<ExternalEstimateProvider>()) {
 }
 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator(
     const std::map<std::string, std::string>& variation_params,
     std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider)
     : TestNetworkQualityEstimator(std::move(external_estimate_provider),
                                   variation_params,
                                   true,
                                   true,
-                                  false) {}
+                                  false,
+                                  base::MakeUnique<BoundTestNetLog>()) {}

[RyanSturm, 2017/01/10 16:22:38]

include ptr_util.h

[tbansal1, 2017/01/10 18:27:53]

Done.

 
 TestNetworkQualityEstimator::TestNetworkQualityEstimator(
     std::unique_ptr<net::ExternalEstimateProvider> external_estimate_provider,
     const std::map<std::string, std::string>& variation_params,
     bool allow_local_host_requests_for_tests,
     bool allow_smaller_responses_for_tests,
-    bool add_default_platform_observations)
+    bool add_default_platform_observations,
+    std::unique_ptr<BoundTestNetLog> net_log)
     : NetworkQualityEstimator(std::move(external_estimate_provider),
                               variation_params,
                               allow_local_host_requests_for_tests,
                               allow_smaller_responses_for_tests,
-                              add_default_platform_observations),
+                              add_default_platform_observations,
+                              net_log->bound()),
       current_network_type_(NetworkChangeNotifier::CONNECTION_UNKNOWN),
       accuracy_recording_intervals_set_(false),
       rand_double_(0.0),
-      embedded_test_server_(base::FilePath(kTestFilePath)) {
+      embedded_test_server_(base::FilePath(kTestFilePath)),
+      net_log_(std::move(net_log)) {
   // Set up the embedded test server.
   EXPECT_TRUE(embedded_test_server_.Start());
 }
 
 TestNetworkQualityEstimator::~TestNetworkQualityEstimator() {}
 
 void TestNetworkQualityEstimator::RunOneRequest() {
   TestDelegate test_delegate;
   TestURLRequestContext context(true);
   context.set_network_quality_estimator(this);
@@ skipping 119 matching lines @@
   if (accuracy_recording_intervals_set_)
     return accuracy_recording_intervals_;
 
   return NetworkQualityEstimator::GetAccuracyRecordingIntervals();
 }
 
 double TestNetworkQualityEstimator::RandDouble() const {
   return rand_double_;
 }
 
+int TestNetworkQualityEstimator::GetEntriesCount(NetLogEventType type) const {
+  TestNetLogEntry::List entries;
+  net_log_->GetEntries(&entries);
+
+  int count = 0;
+  for (auto entry : entries) {
+    if (entry.type == type)
+      ++count;
+  }
+  return count;
+}
+
 nqe::internal::NetworkID TestNetworkQualityEstimator::GetCurrentNetworkID()
     const {
   return nqe::internal::NetworkID(current_network_type_, current_network_id_);
 }
 
 TestNetworkQualityEstimator::LocalHttpTestServer::LocalHttpTestServer(
     const base::FilePath& document_root) {
   AddDefaultHandlers(document_root);
 }
 
 }  // namespace net