| Index: components/data_use_measurement/core/data_use_measurement_unittest.cc
|
| diff --git a/components/data_use_measurement/core/data_use_measurement_unittest.cc b/components/data_use_measurement/core/data_use_measurement_unittest.cc
|
| index 707577b65152c325c2be79799df4f81bcd91c650..f8c36c7846044a8c27ad8eae14cbd8e2855328fa 100644
|
| --- a/components/data_use_measurement/core/data_use_measurement_unittest.cc
|
| +++ b/components/data_use_measurement/core/data_use_measurement_unittest.cc
|
| @@ -58,7 +58,9 @@ class DataUseMeasurementTest : public testing::Test {
|
| }
|
|
|
| // Creates a test request.
|
| - std::unique_ptr<net::URLRequest> CreateTestRequest(bool is_user_request) {
|
| + enum RequestKind { kServiceRequest, kUserRequest };
|
| + std::unique_ptr<net::URLRequest> CreateTestRequest(
|
| + RequestKind is_user_request) {
|
| net::TestDelegate test_delegate;
|
| InitializeContext();
|
| net::MockRead reads[] = {net::MockRead("HTTP/1.1 200 OK\r\n"
|
| @@ -70,7 +72,7 @@ class DataUseMeasurementTest : public testing::Test {
|
|
|
| std::unique_ptr<net::URLRequest> request(context_->CreateRequest(
|
| GURL("http://foo.com"), net::DEFAULT_PRIORITY, &test_delegate));
|
| - if (is_user_request) {
|
| + if (is_user_request == kUserRequest) {
|
| UserRequestUserDataForTesting::MarkAsUserRequest(request.get());
|
| } else {
|
| request->SetUserData(
|
| @@ -87,7 +89,7 @@ class DataUseMeasurementTest : public testing::Test {
|
|
|
| // Sends a request and reports data use attaching either user data or service
|
| // data based on |is_user_request|.
|
| - void SendRequest(bool is_user_request) {
|
| + void SendRequest(RequestKind is_user_request) {
|
| std::unique_ptr<net::URLRequest> request =
|
| CreateTestRequest(is_user_request);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| @@ -100,7 +102,7 @@ class DataUseMeasurementTest : public testing::Test {
|
| // reflected in proper histograms.
|
| void TestForAUserRequest(const std::string& target_dimension) {
|
| base::HistogramTester histogram_tester;
|
| - SendRequest(true);
|
| + SendRequest(kUserRequest);
|
| histogram_tester.ExpectTotalCount("DataUse.TrafficSize.User.Downstream." +
|
| target_dimension + kConnectionType,
|
| 1);
|
| @@ -121,7 +123,7 @@ class DataUseMeasurementTest : public testing::Test {
|
| // reflected in proper histograms.
|
| void TestForAServiceRequest(const std::string& target_dimension) {
|
| base::HistogramTester histogram_tester;
|
| - SendRequest(false);
|
| + SendRequest(kServiceRequest);
|
| histogram_tester.ExpectTotalCount("DataUse.TrafficSize.System.Downstream." +
|
| target_dimension + kConnectionType,
|
| 1);
|
| @@ -188,14 +190,14 @@ TEST_F(DataUseMeasurementTest, ApplicationStateTest) {
|
|
|
| TEST_F(DataUseMeasurementTest, DataUseForwarderIsCalled) {
|
| EXPECT_FALSE(IsDataUseForwarderCalled());
|
| - SendRequest(true);
|
| + SendRequest(kUserRequest);
|
| EXPECT_TRUE(IsDataUseForwarderCalled());
|
| }
|
|
|
| #if defined(OS_ANDROID)
|
| TEST_F(DataUseMeasurementTest, AppStateUnknown) {
|
| base::HistogramTester histogram_tester;
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(true);
|
| + std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
|
|
| {
|
| @@ -231,7 +233,7 @@ TEST_F(DataUseMeasurementTest, AppStateUnknown) {
|
|
|
| TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) {
|
| {
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(true);
|
| + std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| base::HistogramTester histogram_tester;
|
| data_use_measurement()->OnApplicationStateChange(
|
| @@ -249,7 +251,7 @@ TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) {
|
| {
|
| // Create new request when app is in foreground..
|
| base::HistogramTester histogram_tester;
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(true);
|
| + std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| data_use_measurement_.OnNetworkBytesSent(*request, 100);
|
| data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
|
| @@ -262,7 +264,7 @@ TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) {
|
| }
|
|
|
| {
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(true);
|
| + std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| base::HistogramTester histogram_tester;
|
| data_use_measurement()->OnApplicationStateChange(
|
| @@ -280,7 +282,7 @@ TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) {
|
| {
|
| // Create new request when app is in background.
|
| base::HistogramTester histogram_tester;
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(true);
|
| + std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| data_use_measurement_.OnNetworkBytesSent(*request, 100);
|
| data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
|
| @@ -295,7 +297,8 @@ TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) {
|
| {
|
| // Create new request when app is in background.
|
| base::HistogramTester histogram_tester;
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(false);
|
| + std::unique_ptr<net::URLRequest> request =
|
| + CreateTestRequest(kServiceRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| data_use_measurement_.OnNetworkBytesSent(*request, 100);
|
| data_use_measurement_.OnNetworkBytesReceived(*request, 1000);
|
| @@ -312,7 +315,7 @@ TEST_F(DataUseMeasurementTest, TimeOfBackgroundDownstreamBytes) {
|
| }
|
|
|
| {
|
| - std::unique_ptr<net::URLRequest> request = CreateTestRequest(true);
|
| + std::unique_ptr<net::URLRequest> request = CreateTestRequest(kUserRequest);
|
| data_use_measurement_.OnBeforeURLRequest(request.get());
|
| base::HistogramTester histogram_tester;
|
| data_use_measurement()->OnApplicationStateChange(
|
|
|