Support needed to measure user and service traffic in Chrome.

components/data_use_measurement/content/data_use_measurement_unittest.cc

Index: components/data_use_measurement/content/data_use_measurement_unittest.cc
diff --git a/components/data_use_measurement/content/data_use_measurement_unittest.cc b/components/data_use_measurement/content/data_use_measurement_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b800c9e6930e25053b469fbe23462c9de7cd8c33
--- /dev/null
+++ b/components/data_use_measurement/content/data_use_measurement_unittest.cc
@@ -0,0 +1,136 @@
+// Copyright 2015 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 "components/data_use_measurement/content/data_use_measurement.h"
+
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
+#include "base/test/histogram_tester.h"
+#include "content/public/browser/resource_request_info.h"
+#include "net/base/network_change_notifier.h"
+#include "net/base/request_priority.h"
+#include "net/socket/socket_test_util.h"
+#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_test_util.h"
+#include "testing/gmock/include/gmock/gmock.h"

[sclittle, 2015/09/08 18:47:59]

It doesn't look like you're actually using GMOCK here, so remove this include.

[amohammadkhan, 2015/09/08 23:00:10]

Done.

+#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+
+#if defined(OS_ANDROID)
+#include "base/android/application_status_listener.h"
+#endif
+
+namespace data_use_measurement {
+
+class DataUseMeasurementTest : public testing::Test {
+ public:
+  DataUseMeasurementTest() : context_(new net::TestURLRequestContext(true)) {
+    // During the test it is expected to not have cellular connection.
+    DCHECK(!net::NetworkChangeNotifier::IsConnectionCellular(
+        net::NetworkChangeNotifier::GetConnectionType()));
+    context_->set_client_socket_factory(&socket_factory_);
+    context_->set_network_delegate(&test_network_delegate_);
+    context_->Init();
+  }
+
+  // This function makes a user request and confirms that its effect is
+  // reflected in proper histograms.
+  void TestForAUserRequest(const std::string& target_dimension) {
+    net::TestDelegate test_delegate;
+
+    socket_factory_.AddSocketDataProvider(new net::StaticSocketDataProvider(
+        reads_, arraysize(reads_), nullptr, 0));
+    base::HistogramTester histogram_tester;
+    scoped_ptr<net::URLRequest> request(context_->CreateRequest(
+        GURL("http://foo.com"), net::DEFAULT_PRIORITY, &test_delegate));
+    request->SetUserData(
+        data_use_measurement::DataUseUserData::kUserDataKey,
+        new data_use_measurement::DataUseUserData(
+            data_use_measurement::DataUseUserData::SUGGESTIONS));
+    request->Start();
+    loop_.Run();

[sclittle, 2015/09/08 18:48:00]

Change this to loop_.RunUntilIdle(), same below in the other method.

[amohammadkhan, 2015/09/08 23:00:10]

Done.

+    data_use_measurement_.ReportDataUseUMA(request.get());
+    histogram_tester.ExpectTotalCount("DataUse.TrafficSize.System.Downstream." +
+                                          target_dimension + kConnectionType,
+                                      1);
+    histogram_tester.ExpectTotalCount("DataUse.TrafficSize.System.Upstream." +
+                                          target_dimension + kConnectionType,
+                                      1);
+    // One upload and one download message, so total count should be 2.
+    histogram_tester.ExpectTotalCount("DataUse.MessageSize.Suggestions", 2);
+  }
+
+  // This function makes a service request and confirms that its effect is
+  // reflected in proper histograms.
+  void TestForAServiceRequest(const std::string& target_dimension) {
+    net::TestDelegate test_delegate;
+
+    new net::StaticSocketDataProvider(reads_, arraysize(reads_), nullptr, 0);
+    socket_factory_.AddSocketDataProvider(new net::StaticSocketDataProvider(
+        reads_, arraysize(reads_), nullptr, 0));
+    base::HistogramTester histogram_tester;
+    scoped_ptr<net::URLRequest> request(context_->CreateRequest(
+        GURL("http://foo.com"), net::DEFAULT_PRIORITY, &test_delegate));
+    content::ResourceRequestInfo::AllocateForTesting(
+        request.get(), content::RESOURCE_TYPE_MAIN_FRAME, nullptr, -2, -2, -2,
+        true, false, true, true);
+    request->Start();
+    loop_.Run();
+    data_use_measurement_.ReportDataUseUMA(request.get());
+    histogram_tester.ExpectTotalCount("DataUse.TrafficSize.User.Downstream." +
+                                          target_dimension + kConnectionType,
+                                      1);
+    histogram_tester.ExpectTotalCount("DataUse.TrafficSize.User.Upstream." +
+                                          target_dimension + kConnectionType,
+                                      1);
+    histogram_tester.ExpectTotalCount(
+        "DataUse.MessageSize.AllServices.Upstream." + target_dimension +
+            kConnectionType,
+        0);
+    histogram_tester.ExpectTotalCount(
+        "DataUse.MessageSize.AllServices.Downstream." + target_dimension +
+            kConnectionType,
+        0);
+  }
+
+  DataUseMeasurement* data_use_measurement() { return &data_use_measurement_; }
+
+ private:
+  net::MockRead reads_[3] = {net::MockRead("HTTP/1.1 200 OK\r\n"

[sclittle, 2015/09/08 18:48:00]

This fails to compile on the windows trybots. Move the MockReads array up into
each of the test methods above, and remove the "3" from "reads[3]" since the 3
isn't necessary and there's actually only 2 elements. 

[amohammadkhan, 2015/09/08 23:00:10]

You are right. After our offline discussion, I noticed that there is a Reset
function for StaticSocketDataProvider, so I took advantages of that. So I think
there is no unauthorized memory access/memory leak/restriction in calling
functions anymore.

+                                           "Content-Length: 12\r\n\r\n"),
+                             net::MockRead("Test Content")};
+  DataUseMeasurement data_use_measurement_;
+  base::MessageLoopForIO loop_;
+  net::MockClientSocketFactory socket_factory_;
+  net::TestNetworkDelegate test_network_delegate_;
+  scoped_ptr<net::TestURLRequestContext> context_;
+  const std::string kConnectionType = "NotCellular";
+
+  DISALLOW_COPY_AND_ASSIGN(DataUseMeasurementTest);
+};
+
+// This test function tests recording of data use information in UMA histogram
+// when packet is originated from user or services.
+// TODO(amohammadkhan): Add tests for Cellular/non-cellular connection types
+// when support for testing is provided in its class.
+TEST_F(DataUseMeasurementTest, UserNotUserTest) {
+#if defined(OS_ANDROID)
+  data_use_measurement()->OnApplicationStateChangeForTesting(
+      base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES);
+#endif
+  TestForAServiceRequest("Foreground.");
+  TestForAUserRequest("Foreground.");
+}
+
+#if defined(OS_ANDROID)
+TEST_F(DataUseMeasurementTest, ApplicationStateTest) {
+  data_use_measurement()->OnApplicationStateChangeForTesting(
+      base::android::APPLICATION_STATE_HAS_STOPPED_ACTIVITIES);
+  TestForAServiceRequest("Background.");
+  TestForAUserRequest("Background.");
+}
+#endif
+
+}  // namespace data_use_measurement