OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/data_use_measurement/content/data_use_measurement.h" | 5 #include "components/data_use_measurement/content/data_use_measurement.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/message_loop/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
| 12 #include "base/run_loop.h" |
12 #include "base/test/histogram_tester.h" | 13 #include "base/test/histogram_tester.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "content/public/browser/resource_request_info.h" | 15 #include "content/public/browser/resource_request_info.h" |
15 #include "net/base/network_change_notifier.h" | 16 #include "net/base/network_change_notifier.h" |
16 #include "net/base/request_priority.h" | 17 #include "net/base/request_priority.h" |
17 #include "net/socket/socket_test_util.h" | 18 #include "net/socket/socket_test_util.h" |
18 #include "net/url_request/url_request.h" | 19 #include "net/url_request/url_request.h" |
19 #include "net/url_request/url_request_test_util.h" | 20 #include "net/url_request/url_request_test_util.h" |
20 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
21 #include "url/gurl.h" | 22 #include "url/gurl.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 data_use_measurement::DataUseUserData::kUserDataKey, | 57 data_use_measurement::DataUseUserData::kUserDataKey, |
57 new data_use_measurement::DataUseUserData( | 58 new data_use_measurement::DataUseUserData( |
58 data_use_measurement::DataUseUserData::SUGGESTIONS)); | 59 data_use_measurement::DataUseUserData::SUGGESTIONS)); |
59 } else { | 60 } else { |
60 content::ResourceRequestInfo::AllocateForTesting( | 61 content::ResourceRequestInfo::AllocateForTesting( |
61 request.get(), content::RESOURCE_TYPE_MAIN_FRAME, nullptr, -2, -2, -2, | 62 request.get(), content::RESOURCE_TYPE_MAIN_FRAME, nullptr, -2, -2, -2, |
62 true, false, true, true, false); | 63 true, false, true, true, false); |
63 } | 64 } |
64 | 65 |
65 request->Start(); | 66 request->Start(); |
66 loop_.RunUntilIdle(); | 67 base::RunLoop().RunUntilIdle(); |
67 | 68 |
68 data_use_measurement_.ReportDataUseUMA(request.get()); | 69 data_use_measurement_.ReportDataUseUMA(request.get()); |
69 } | 70 } |
70 | 71 |
71 // This function makes a user request and confirms that its effect is | 72 // This function makes a user request and confirms that its effect is |
72 // reflected in proper histograms. | 73 // reflected in proper histograms. |
73 void TestForAUserRequest(const std::string& target_dimension) { | 74 void TestForAUserRequest(const std::string& target_dimension) { |
74 base::HistogramTester histogram_tester; | 75 base::HistogramTester histogram_tester; |
75 SendRequest(true); | 76 SendRequest(true); |
76 histogram_tester.ExpectTotalCount("DataUse.TrafficSize.System.Downstream." + | 77 histogram_tester.ExpectTotalCount("DataUse.TrafficSize.System.Downstream." + |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 } | 159 } |
159 #endif | 160 #endif |
160 | 161 |
161 TEST_F(DataUseMeasurementTest, DataUseForwarderIsCalled) { | 162 TEST_F(DataUseMeasurementTest, DataUseForwarderIsCalled) { |
162 EXPECT_FALSE(IsDataUseForwarderCalled()); | 163 EXPECT_FALSE(IsDataUseForwarderCalled()); |
163 SendRequest(true); | 164 SendRequest(true); |
164 EXPECT_TRUE(IsDataUseForwarderCalled()); | 165 EXPECT_TRUE(IsDataUseForwarderCalled()); |
165 } | 166 } |
166 | 167 |
167 } // namespace data_use_measurement | 168 } // namespace data_use_measurement |
OLD | NEW |