Chromium Code Reviews| 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..7e8040009715e8269b4403adfaff77d0a346c632 100644 |
| --- a/chrome/browser/net/chrome_network_delegate_unittest.cc |
| +++ b/chrome/browser/net/chrome_network_delegate_unittest.cc |
| @@ -9,14 +9,19 @@ |
| #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/browser/profiles/profile_manager.h" |
| #include "chrome/common/pref_names.h" |
| #include "chrome/test/base/testing_pref_service_syncable.h" |
| #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/core/data_use_user_data.h" |
| +#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" |
| @@ -152,6 +157,109 @@ TEST_F(ChromeNetworkDelegateSafeSearchTest, SafeSearch) { |
| } |
| } |
| +// This class tests recoding data use of user and services in histograms. |
| +class ChromeNetworkDelegateDataUseMeasurementTest : public testing::Test { |
| + public: |
| + ChromeNetworkDelegateDataUseMeasurementTest() |
| + : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) { |
| +#if defined(ENABLE_EXTENSIONS) |
| + forwarder_ = new extensions::EventRouterForwarder(); |
| +#endif |
| + } |
| + |
| + void SetUp() override { |
| + ChromeNetworkDelegate::InitializePrefsOnUIThread( |
| + &enable_referrers_, NULL, NULL, NULL, profile_.GetTestingPrefService()); |
| + } |
| + |
| + protected: |
| + scoped_ptr<net::NetworkDelegate> CreateNetworkDelegate() { |
| + scoped_ptr<ChromeNetworkDelegate> network_delegate( |
| + new ChromeNetworkDelegate(forwarder(), &enable_referrers_)); |
| + return network_delegate.Pass(); |
| + } |
| + |
| + void SetDelegate(net::NetworkDelegate* delegate) { |
| + network_delegate_ = delegate; |
| + context_.set_network_delegate(network_delegate_); |
| + } |
| + |
| + // 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. It should be negative for testing. |
| + -2, -2, true, false, true, true); |
| + } else { |
| + request->SetUserData( |
| + data_use_measurement::DataUseUserData::kUserDataKey, |
| + new data_use_measurement::DataUseUserData( |
| + data_use_measurement::DataUseUserData::SUGGESTIONS)); |
| + } |
| + request->Start(); |
| + base::MessageLoop::current()->RunUntilIdle(); |
| + } |
| + |
| + private: |
| + extensions::EventRouterForwarder* forwarder() { |
|
Alexei Svitkine (slow)
2015/08/31 17:26:31
If this compiles when ENABLE_EXTENSIONS is not def
amohammadkhan
2015/09/01 04:52:48
Done.
(I changed it, but after running tests on t
|
| +#if defined(ENABLE_EXTENSIONS) |
| + return forwarder_.get(); |
| +#else |
| + return NULL; |
| +#endif |
| + } |
| + |
| + content::TestBrowserThreadBundle thread_bundle_; |
| +#if defined(ENABLE_EXTENSIONS) |
| + scoped_refptr<extensions::EventRouterForwarder> forwarder_; |
| +#endif |
| + TestingProfile profile_; |
| + BooleanPrefMember enable_referrers_; |
| + scoped_ptr<net::URLRequest> request_; |
| + net::TestURLRequestContext context_; |
| + net::NetworkDelegate* network_delegate_; |
| + net::TestDelegate delegate_; |
| +}; |
| + |
| +// 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(ChromeNetworkDelegateDataUseMeasurementTest, MainTest) { |
| + 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.Suggestions", 2); |
| + // The upload nad download messages are empty, so their size should be 0. |
| + histogram_tester.ExpectUniqueSample("DataUse.Service.Suggestions", 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: |