Support needed to measure user and service traffic in Chrome.

chrome/browser/net/chrome_network_delegate_unittest.cc

Index: chrome/browser/net/chrome_network_delegate_unittest.cc
diff --git a/chrome/browser/net/chrome_network_delegate_unittest.cc b/chrome/browser/net/chrome_network_delegate_unittest.cc
index 3ca7bbe09a078acaab591f43fdcdc47c065fa020..306c9e506a6fd4d2d5185a701fced8da8f660488 100644
--- a/chrome/browser/net/chrome_network_delegate_unittest.cc
+++ b/chrome/browser/net/chrome_network_delegate_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_member.h"
+#include "base/test/histogram_tester.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
 #include "chrome/browser/net/safe_search_util.h"
 #include "chrome/common/pref_names.h"
@@ -16,7 +17,10 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/cookie_settings.h"
 #include "components/content_settings/core/common/pref_names.h"
+#include "components/data_use_measurement/content/data_use_user_data.h"

[sclittle, 2015/08/26 23:08:29]

Isn't data_use_user_data under "core/"?

[amohammadkhan, 2015/08/29 01:00:59]

Done.

+#include "content/public/browser/resource_request_info.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/resource_type.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request.h"
@@ -115,6 +119,30 @@ class ChromeNetworkDelegateSafeSearchTest : public testing::Test {
         safe_search_util::GetForceYouTubeSafetyModeCountForTesting());
   }
 
+  // This function queries a URLRequest. If |from_user| is true, so it attaches
+  // a ResourceRequestInfo to the URLRequest, because requests from users have
+  // this info. If |from_user| is false, the request assumed to be from one of
+  // the services so it attaches a DataUseUserData. ServiceName is used as the
+  // name of the service owning this request.
+  void QueryURLDataUse(bool from_user) {
+    scoped_ptr<net::URLRequest> request(context_.CreateRequest(
+        GURL("http://example.com"), net::DEFAULT_PRIORITY, &delegate_));
+    // The render_process_id should be negative, all the other parameters are
+    // arbitrary.
+    if (from_user) {
+      content::ResourceRequestInfo::AllocateForTesting(
+          request.get(), content::RESOURCE_TYPE_MAIN_FRAME, NULL,
+          -2,  // render_process_id
+          -2, -2, true, false, true, true);
+    } else {
+      request->SetUserData(
+          measurement_component::DataUseUserData::kUserDataKey,

[sclittle, 2015/08/26 23:08:29]

That namespace looks wrong, "measurement_component"

[amohammadkhan, 2015/08/29 01:00:59]

Done.

+          new measurement_component::DataUseUserData("ServiceName"));
+    }
+    request->Start();
+    base::MessageLoop::current()->RunUntilIdle();
+  }
+
  private:
   extensions::EventRouterForwarder* forwarder() {
 #if defined(ENABLE_EXTENSIONS)
@@ -152,6 +180,37 @@ TEST_F(ChromeNetworkDelegateSafeSearchTest, SafeSearch) {
   }
 }
 
+// This function tests data use measurement for different types of requests by
+// making two queries. First query is similar to a query from a service, so it
+// should affect DataUse.NotUser.Dimensions and DataUse.service.ServiceName
+// histograms. The second query is similar to a query from a user, so it should
+// affect DataUse.User.Dimensions. AppState and ConnectionType dimensions are
+// always Foreground and NotCellular respectively. Because Background dimension
+// is only defined for android platform and when Chrome is in background and
+// Cellular ConnectionType is only exist on mobile devices.
+TEST_F(ChromeNetworkDelegateSafeSearchTest, DataUseMeasurement) {
+  scoped_ptr<net::NetworkDelegate> delegate(CreateNetworkDelegate());
+  SetDelegate(delegate.get());
+
+  base::HistogramTester histogram_tester;
+
+  QueryURLDataUse(0);  // A query from a service
+  histogram_tester.ExpectTotalCount(
+      "DataUse.NotUser.Download.Foreground.NotCellular", 1);
+  histogram_tester.ExpectTotalCount(
+      "DataUse.NotUser.Upload.Foreground.NotCellular", 1);
+  // One upload and one download message, so totalCount shoudl be 2.
+  histogram_tester.ExpectTotalCount("DataUse.Service.ServiceName", 2);
+  // The upload nad download messages are empty, so their size should be 0.
+  histogram_tester.ExpectUniqueSample("DataUse.Service.ServiceName", 0, 2);
+
+  QueryURLDataUse(1);  // A query from user
+  histogram_tester.ExpectTotalCount(
+      "DataUse.User.Download.Foreground.NotCellular", 1);
+  histogram_tester.ExpectTotalCount(
+      "DataUse.User.Upload.Foreground.NotCellular", 1);
+}
+
 // Privacy Mode disables Channel Id if cookies are blocked (cr223191)
 class ChromeNetworkDelegatePrivacyModeTest : public testing::Test {
  public: