| 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 "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| 11 #include "base/prefs/scoped_user_pref_update.h" | 11 #include "base/prefs/scoped_user_pref_update.h" |
| 12 #include "chrome/browser/content_settings/content_settings_mock_observer.h" | 12 #include "chrome/browser/content_settings/content_settings_mock_observer.h" |
| 13 #include "chrome/browser/content_settings/cookie_settings.h" | 13 #include "chrome/browser/content_settings/cookie_settings.h" |
| 14 #include "chrome/browser/content_settings/host_content_settings_map.h" | |
| 15 #include "chrome/browser/content_settings/mock_settings_observer.h" | 14 #include "chrome/browser/content_settings/mock_settings_observer.h" |
| 16 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| 17 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
| 18 #include "chrome/test/base/testing_pref_service_syncable.h" | 17 #include "chrome/test/base/testing_pref_service_syncable.h" |
| 19 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" |
| 20 #include "components/content_settings/core/browser/content_settings_details.h" | 19 #include "components/content_settings/core/browser/content_settings_details.h" |
| 20 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 21 #include "content/public/test/test_browser_thread.h" | 21 #include "content/public/test/test_browser_thread.h" |
| 22 #include "net/base/static_cookie_policy.h" | 22 #include "net/base/static_cookie_policy.h" |
| 23 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 24 #include "url/gurl.h" | 24 #include "url/gurl.h" |
| 25 | 25 |
| 26 using content::BrowserThread; | 26 using content::BrowserThread; |
| 27 | 27 |
| 28 using ::testing::_; | 28 using ::testing::_; |
| 29 | 29 |
| 30 class HostContentSettingsMapTest : public testing::Test { | 30 class HostContentSettingsMapTest : public testing::Test { |
| (...skipping 1003 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1034 CONTENT_SETTINGS_TYPE_IMAGES, true); | 1034 CONTENT_SETTINGS_TYPE_IMAGES, true); |
| 1035 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 1035 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 1036 host_content_settings_map->GetContentSetting( | 1036 host_content_settings_map->GetContentSetting( |
| 1037 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); | 1037 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); |
| 1038 host_content_settings_map->SetDefaultContentSetting( | 1038 host_content_settings_map->SetDefaultContentSetting( |
| 1039 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK); | 1039 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK); |
| 1040 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 1040 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 1041 host_content_settings_map->GetContentSetting( | 1041 host_content_settings_map->GetContentSetting( |
| 1042 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); | 1042 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); |
| 1043 } | 1043 } |
| OLD | NEW |