| 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" |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 51 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 52 host_content_settings_map->GetDefaultContentSetting( | 52 host_content_settings_map->GetDefaultContentSetting( |
| 53 CONTENT_SETTINGS_TYPE_IMAGES, NULL)); | 53 CONTENT_SETTINGS_TYPE_IMAGES, NULL)); |
| 54 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( | 54 EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( |
| 55 GURL(chrome::kChromeUINewTabURL), | 55 GURL(chrome::kChromeUINewTabURL), |
| 56 GURL(chrome::kChromeUINewTabURL), | 56 GURL(chrome::kChromeUINewTabURL), |
| 57 CONTENT_SETTINGS_TYPE_IMAGES, | 57 CONTENT_SETTINGS_TYPE_IMAGES, |
| 58 std::string())); | 58 std::string())); |
| 59 { | 59 { |
| 60 host_content_settings_map->SetDefaultContentSetting( | 60 host_content_settings_map->SetDefaultContentSetting( |
| 61 CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ASK); | 61 CONTENT_SETTINGS_TYPE_PLUGINS, |
| 62 EXPECT_EQ(CONTENT_SETTING_ASK, | 62 CONTENT_SETTING_DETECT_IMPORTANT_CONTENT); |
| 63 EXPECT_EQ(CONTENT_SETTING_DETECT_IMPORTANT_CONTENT, |
| 63 host_content_settings_map->GetDefaultContentSetting( | 64 host_content_settings_map->GetDefaultContentSetting( |
| 64 CONTENT_SETTINGS_TYPE_PLUGINS, NULL)); | 65 CONTENT_SETTINGS_TYPE_PLUGINS, NULL)); |
| 65 } | 66 } |
| 66 host_content_settings_map->SetDefaultContentSetting( | 67 host_content_settings_map->SetDefaultContentSetting( |
| 67 CONTENT_SETTINGS_TYPE_POPUPS, CONTENT_SETTING_ALLOW); | 68 CONTENT_SETTINGS_TYPE_POPUPS, CONTENT_SETTING_ALLOW); |
| 68 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 69 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 69 host_content_settings_map->GetDefaultContentSetting( | 70 host_content_settings_map->GetDefaultContentSetting( |
| 70 CONTENT_SETTINGS_TYPE_POPUPS, NULL)); | 71 CONTENT_SETTINGS_TYPE_POPUPS, NULL)); |
| 71 } | 72 } |
| 72 | 73 |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1030 CONTENT_SETTINGS_TYPE_IMAGES, true); | 1031 CONTENT_SETTINGS_TYPE_IMAGES, true); |
| 1031 EXPECT_EQ(CONTENT_SETTING_ALLOW, | 1032 EXPECT_EQ(CONTENT_SETTING_ALLOW, |
| 1032 host_content_settings_map->GetContentSetting( | 1033 host_content_settings_map->GetContentSetting( |
| 1033 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); | 1034 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); |
| 1034 host_content_settings_map->SetDefaultContentSetting( | 1035 host_content_settings_map->SetDefaultContentSetting( |
| 1035 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK); | 1036 CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK); |
| 1036 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 1037 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 1037 host_content_settings_map->GetContentSetting( | 1038 host_content_settings_map->GetContentSetting( |
| 1038 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); | 1039 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); |
| 1039 } | 1040 } |
| OLD | NEW |