| 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 <memory> | 9 #include <memory> | 
| 10 #include <utility> | 10 #include <utility> | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 25 #include "chrome/test/base/testing_profile_manager.h" | 25 #include "chrome/test/base/testing_profile_manager.h" | 
| 26 #include "components/content_settings/core/browser/cookie_settings.h" | 26 #include "components/content_settings/core/browser/cookie_settings.h" | 
| 27 #include "components/content_settings/core/common/pref_names.h" | 27 #include "components/content_settings/core/common/pref_names.h" | 
| 28 #include "components/data_usage/core/data_use_aggregator.h" | 28 #include "components/data_usage/core/data_use_aggregator.h" | 
| 29 #include "components/data_usage/core/data_use_amortizer.h" | 29 #include "components/data_usage/core/data_use_amortizer.h" | 
| 30 #include "components/data_usage/core/data_use_annotator.h" | 30 #include "components/data_usage/core/data_use_annotator.h" | 
| 31 #include "components/prefs/pref_member.h" | 31 #include "components/prefs/pref_member.h" | 
| 32 #include "components/sync_preferences/testing_pref_service_syncable.h" | 32 #include "components/sync_preferences/testing_pref_service_syncable.h" | 
| 33 #include "content/public/browser/resource_request_info.h" | 33 #include "content/public/browser/resource_request_info.h" | 
| 34 #include "content/public/common/content_switches.h" | 34 #include "content/public/common/content_switches.h" | 
|  | 35 #include "content/public/common/previews_state.h" | 
| 35 #include "content/public/common/resource_type.h" | 36 #include "content/public/common/resource_type.h" | 
| 36 #include "content/public/test/test_browser_thread_bundle.h" | 37 #include "content/public/test/test_browser_thread_bundle.h" | 
| 37 #include "extensions/features/features.h" | 38 #include "extensions/features/features.h" | 
| 38 #include "net/base/request_priority.h" | 39 #include "net/base/request_priority.h" | 
| 39 #include "net/http/http_request_headers.h" | 40 #include "net/http/http_request_headers.h" | 
| 40 #include "net/socket/socket_test_util.h" | 41 #include "net/socket/socket_test_util.h" | 
| 41 #include "net/url_request/url_request.h" | 42 #include "net/url_request/url_request.h" | 
| 42 #include "net/url_request/url_request_test_util.h" | 43 #include "net/url_request/url_request_test_util.h" | 
| 43 #include "testing/gtest/include/gtest/gtest.h" | 44 #include "testing/gtest/include/gtest/gtest.h" | 
| 44 #include "url/gurl.h" | 45 #include "url/gurl.h" | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 70   net::StaticSocketDataProvider response_socket_data_provider( | 71   net::StaticSocketDataProvider response_socket_data_provider( | 
| 71       response_mock_reads, arraysize(response_mock_reads), nullptr, 0); | 72       response_mock_reads, arraysize(response_mock_reads), nullptr, 0); | 
| 72   socket_factory->AddSocketDataProvider(&response_socket_data_provider); | 73   socket_factory->AddSocketDataProvider(&response_socket_data_provider); | 
| 73   net::TestDelegate test_delegate; | 74   net::TestDelegate test_delegate; | 
| 74   test_delegate.set_quit_on_complete(true); | 75   test_delegate.set_quit_on_complete(true); | 
| 75   std::unique_ptr<net::URLRequest> request(context->CreateRequest( | 76   std::unique_ptr<net::URLRequest> request(context->CreateRequest( | 
| 76       GURL("http://example.com"), net::DEFAULT_PRIORITY, &test_delegate)); | 77       GURL("http://example.com"), net::DEFAULT_PRIORITY, &test_delegate)); | 
| 77 | 78 | 
| 78   content::ResourceRequestInfo::AllocateForTesting( | 79   content::ResourceRequestInfo::AllocateForTesting( | 
| 79       request.get(), content::RESOURCE_TYPE_MAIN_FRAME, nullptr, -2, -2, -2, | 80       request.get(), content::RESOURCE_TYPE_MAIN_FRAME, nullptr, -2, -2, -2, | 
| 80       true, false, true, true, false); | 81       true, false, true, true, content::PREVIEWS_OFF); | 
| 81 | 82 | 
| 82   request->Start(); | 83   request->Start(); | 
| 83   base::RunLoop().RunUntilIdle(); | 84   base::RunLoop().RunUntilIdle(); | 
| 84   return request; | 85   return request; | 
| 85 } | 86 } | 
| 86 | 87 | 
| 87 // A fake DataUseAggregator for testing that only counts how many times its | 88 // A fake DataUseAggregator for testing that only counts how many times its | 
| 88 // respective methods have been called. | 89 // respective methods have been called. | 
| 89 class FakeDataUseAggregator : public data_usage::DataUseAggregator { | 90 class FakeDataUseAggregator : public data_usage::DataUseAggregator { | 
| 90  public: | 91  public: | 
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 520 | 521 | 
| 521   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, | 522   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, | 
| 522                                                        kBlockedFirstPartySite)); | 523                                                        kBlockedFirstPartySite)); | 
| 523 | 524 | 
| 524   cookie_settings_->SetCookieSetting(kBlockedFirstPartySite, | 525   cookie_settings_->SetCookieSetting(kBlockedFirstPartySite, | 
| 525                                      CONTENT_SETTING_BLOCK); | 526                                      CONTENT_SETTING_BLOCK); | 
| 526   // Privacy mode is disabled as kAllowedSite is still getting cookies | 527   // Privacy mode is disabled as kAllowedSite is still getting cookies | 
| 527   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, | 528   EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, | 
| 528                                                        kBlockedFirstPartySite)); | 529                                                        kBlockedFirstPartySite)); | 
| 529 } | 530 } | 
| OLD | NEW | 
|---|