| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/host_content_settings_map.h" | 5 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
| 11 #include "chrome/browser/prefs/pref_service.h" | 11 #include "chrome/browser/prefs/pref_service.h" |
| 12 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
| 13 #include "chrome/common/notification_registrar.h" | 13 #include "chrome/common/notification_registrar.h" |
| 14 #include "chrome/common/notification_service.h" | 14 #include "chrome/common/notification_service.h" |
| 15 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
| (...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1009 | 1009 |
| 1010 // After unsetting the managed value for the preference BlockThirdPartyCookies | 1010 // After unsetting the managed value for the preference BlockThirdPartyCookies |
| 1011 // the default value should be returned now. | 1011 // the default value should be returned now. |
| 1012 prefs->RemoveManagedPref(prefs::kBlockThirdPartyCookies); | 1012 prefs->RemoveManagedPref(prefs::kBlockThirdPartyCookies); |
| 1013 EXPECT_EQ(false, | 1013 EXPECT_EQ(false, |
| 1014 host_content_settings_map->IsBlockThirdPartyCookiesManaged()); | 1014 host_content_settings_map->IsBlockThirdPartyCookiesManaged()); |
| 1015 EXPECT_EQ(false, host_content_settings_map->BlockThirdPartyCookies()); | 1015 EXPECT_EQ(false, host_content_settings_map->BlockThirdPartyCookies()); |
| 1016 } | 1016 } |
| 1017 | 1017 |
| 1018 } // namespace | 1018 } // namespace |
| OLD | NEW |