OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/net/chrome_network_delegate.h" | 5 #include "chrome/browser/net/chrome_network_delegate.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/prefs/pref_member.h" | 13 #include "base/prefs/pref_member.h" |
14 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
15 #include "base/test/histogram_tester.h" | 15 #include "base/test/histogram_tester.h" |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/content_settings/cookie_settings_factory.h" | 17 #include "chrome/browser/content_settings/cookie_settings_factory.h" |
18 #include "chrome/browser/net/safe_search_util.h" | 18 #include "chrome/browser/net/safe_search_util.h" |
19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
20 #include "chrome/test/base/testing_browser_process.h" | 20 #include "chrome/test/base/testing_browser_process.h" |
21 #include "chrome/test/base/testing_profile.h" | 21 #include "chrome/test/base/testing_profile.h" |
22 #include "chrome/test/base/testing_profile_manager.h" | 22 #include "chrome/test/base/testing_profile_manager.h" |
23 #include "components/content_settings/core/browser/cookie_settings.h" | 23 #include "components/content_settings/core/browser/cookie_settings.h" |
24 #include "components/content_settings/core/common/pref_names.h" | 24 #include "components/content_settings/core/common/pref_names.h" |
25 #include "components/data_usage/core/data_use_aggregator.h" | 25 #include "components/data_usage/core/data_use_aggregator.h" |
26 #include "components/data_usage/core/data_use_amortizer.h" | |
26 #include "components/syncable_prefs/testing_pref_service_syncable.h" | 27 #include "components/syncable_prefs/testing_pref_service_syncable.h" |
27 #include "content/public/browser/resource_request_info.h" | 28 #include "content/public/browser/resource_request_info.h" |
28 #include "content/public/common/content_switches.h" | 29 #include "content/public/common/content_switches.h" |
29 #include "content/public/common/resource_type.h" | 30 #include "content/public/common/resource_type.h" |
30 #include "content/public/test/test_browser_thread_bundle.h" | 31 #include "content/public/test/test_browser_thread_bundle.h" |
31 #include "net/base/request_priority.h" | 32 #include "net/base/request_priority.h" |
32 #include "net/socket/socket_test_util.h" | 33 #include "net/socket/socket_test_util.h" |
33 #include "net/url_request/url_request.h" | 34 #include "net/url_request/url_request.h" |
34 #include "net/url_request/url_request_test_util.h" | 35 #include "net/url_request/url_request_test_util.h" |
35 #include "testing/gtest/include/gtest/gtest.h" | 36 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
92 request->Start(); | 93 request->Start(); |
93 base::RunLoop().RunUntilIdle(); | 94 base::RunLoop().RunUntilIdle(); |
94 return request.Pass(); | 95 return request.Pass(); |
95 } | 96 } |
96 | 97 |
97 // A fake DataUseAggregator for testing that only counts how many times its | 98 // A fake DataUseAggregator for testing that only counts how many times its |
98 // respective methods have been called. | 99 // respective methods have been called. |
99 class FakeDataUseAggregator : public data_usage::DataUseAggregator { | 100 class FakeDataUseAggregator : public data_usage::DataUseAggregator { |
100 public: | 101 public: |
101 FakeDataUseAggregator() | 102 FakeDataUseAggregator() |
102 : on_the_record_tx_bytes_(0), | 103 : data_usage::DataUseAggregator(scoped_ptr<data_usage::DataUseAmortizer>() |
104 .Pass()), | |
tbansal1
2015/10/12 21:23:20
nit: don't think Pass() is needed
| |
105 on_the_record_tx_bytes_(0), | |
103 on_the_record_rx_bytes_(0), | 106 on_the_record_rx_bytes_(0), |
104 off_the_record_tx_bytes_(0), | 107 off_the_record_tx_bytes_(0), |
105 off_the_record_rx_bytes_(0) {} | 108 off_the_record_rx_bytes_(0) {} |
106 ~FakeDataUseAggregator() override {} | 109 ~FakeDataUseAggregator() override {} |
107 | 110 |
108 void ReportDataUse(const net::URLRequest& request, | 111 void ReportDataUse(const net::URLRequest& request, |
109 int32_t tab_id, | 112 int32_t tab_id, |
110 int64_t tx_bytes, | 113 int64_t tx_bytes, |
111 int64_t rx_bytes) override { | 114 int64_t rx_bytes) override { |
112 on_the_record_tx_bytes_ += tx_bytes; | 115 on_the_record_tx_bytes_ += tx_bytes; |
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
530 kBlockedFirstPartySite)); | 533 kBlockedFirstPartySite)); |
531 | 534 |
532 cookie_settings_->SetCookieSetting( | 535 cookie_settings_->SetCookieSetting( |
533 ContentSettingsPattern::FromURL(kBlockedFirstPartySite), | 536 ContentSettingsPattern::FromURL(kBlockedFirstPartySite), |
534 ContentSettingsPattern::Wildcard(), | 537 ContentSettingsPattern::Wildcard(), |
535 CONTENT_SETTING_BLOCK); | 538 CONTENT_SETTING_BLOCK); |
536 // Privacy mode is disabled as kAllowedSite is still getting cookies | 539 // Privacy mode is disabled as kAllowedSite is still getting cookies |
537 EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, | 540 EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, |
538 kBlockedFirstPartySite)); | 541 kBlockedFirstPartySite)); |
539 } | 542 } |
OLD | NEW |