| 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 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/message_loop/message_loop.h" | 14 #include "base/message_loop/message_loop.h" |
| 15 #include "base/prefs/pref_member.h" | |
| 16 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
| 17 #include "base/test/histogram_tester.h" | 16 #include "base/test/histogram_tester.h" |
| 18 #include "build/build_config.h" | 17 #include "build/build_config.h" |
| 19 #include "chrome/browser/browser_process.h" | 18 #include "chrome/browser/browser_process.h" |
| 20 #include "chrome/browser/content_settings/cookie_settings_factory.h" | 19 #include "chrome/browser/content_settings/cookie_settings_factory.h" |
| 21 #include "chrome/browser/net/safe_search_util.h" | 20 #include "chrome/browser/net/safe_search_util.h" |
| 22 #include "chrome/common/pref_names.h" | 21 #include "chrome/common/pref_names.h" |
| 23 #include "chrome/test/base/testing_browser_process.h" | 22 #include "chrome/test/base/testing_browser_process.h" |
| 24 #include "chrome/test/base/testing_profile.h" | 23 #include "chrome/test/base/testing_profile.h" |
| 25 #include "chrome/test/base/testing_profile_manager.h" | 24 #include "chrome/test/base/testing_profile_manager.h" |
| 26 #include "components/content_settings/core/browser/cookie_settings.h" | 25 #include "components/content_settings/core/browser/cookie_settings.h" |
| 27 #include "components/content_settings/core/common/pref_names.h" | 26 #include "components/content_settings/core/common/pref_names.h" |
| 28 #include "components/data_usage/core/data_use_aggregator.h" | 27 #include "components/data_usage/core/data_use_aggregator.h" |
| 29 #include "components/data_usage/core/data_use_amortizer.h" | 28 #include "components/data_usage/core/data_use_amortizer.h" |
| 30 #include "components/data_usage/core/data_use_annotator.h" | 29 #include "components/data_usage/core/data_use_annotator.h" |
| 30 #include "components/prefs/pref_member.h" |
| 31 #include "components/syncable_prefs/testing_pref_service_syncable.h" | 31 #include "components/syncable_prefs/testing_pref_service_syncable.h" |
| 32 #include "content/public/browser/resource_request_info.h" | 32 #include "content/public/browser/resource_request_info.h" |
| 33 #include "content/public/common/content_switches.h" | 33 #include "content/public/common/content_switches.h" |
| 34 #include "content/public/common/resource_type.h" | 34 #include "content/public/common/resource_type.h" |
| 35 #include "content/public/test/test_browser_thread_bundle.h" | 35 #include "content/public/test/test_browser_thread_bundle.h" |
| 36 #include "net/base/request_priority.h" | 36 #include "net/base/request_priority.h" |
| 37 #include "net/socket/socket_test_util.h" | 37 #include "net/socket/socket_test_util.h" |
| 38 #include "net/url_request/url_request.h" | 38 #include "net/url_request/url_request.h" |
| 39 #include "net/url_request/url_request_test_util.h" | 39 #include "net/url_request/url_request_test_util.h" |
| 40 #include "testing/gtest/include/gtest/gtest.h" | 40 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 kBlockedFirstPartySite)); | 537 kBlockedFirstPartySite)); |
| 538 | 538 |
| 539 cookie_settings_->SetCookieSetting( | 539 cookie_settings_->SetCookieSetting( |
| 540 ContentSettingsPattern::FromURL(kBlockedFirstPartySite), | 540 ContentSettingsPattern::FromURL(kBlockedFirstPartySite), |
| 541 ContentSettingsPattern::Wildcard(), | 541 ContentSettingsPattern::Wildcard(), |
| 542 CONTENT_SETTING_BLOCK); | 542 CONTENT_SETTING_BLOCK); |
| 543 // Privacy mode is disabled as kAllowedSite is still getting cookies | 543 // Privacy mode is disabled as kAllowedSite is still getting cookies |
| 544 EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, | 544 EXPECT_FALSE(network_delegate_->CanEnablePrivacyMode(kAllowedSite, |
| 545 kBlockedFirstPartySite)); | 545 kBlockedFirstPartySite)); |
| 546 } | 546 } |
| OLD | NEW |