OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/content_settings/mock_settings_observer.h" | 5 #include "chrome/browser/content_settings/mock_settings_observer.h" |
6 | 6 |
7 #include "chrome/browser/content_settings/content_settings_details.h" | 7 #include "chrome/browser/content_settings/content_settings_details.h" |
8 #include "chrome/browser/content_settings/host_content_settings_map.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map.h" |
9 #include "chrome/common/chrome_notification_types.h" | 9 #include "chrome/common/chrome_notification_types.h" |
10 #include "content/public/browser/notification_service.h" | 10 #include "content/public/browser/notification_service.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 content::Details<ContentSettingsDetails>(details).ptr(); | 28 content::Details<ContentSettingsDetails>(details).ptr(); |
29 OnContentSettingsChanged(map, | 29 OnContentSettingsChanged(map, |
30 settings_details->type(), | 30 settings_details->type(), |
31 settings_details->update_all_types(), | 31 settings_details->update_all_types(), |
32 settings_details->primary_pattern(), | 32 settings_details->primary_pattern(), |
33 settings_details->secondary_pattern(), | 33 settings_details->secondary_pattern(), |
34 settings_details->update_all()); | 34 settings_details->update_all()); |
35 // This checks that calling a Get function from an observer doesn't | 35 // This checks that calling a Get function from an observer doesn't |
36 // deadlock. | 36 // deadlock. |
37 GURL url("http://random-hostname.com/"); | 37 GURL url("http://random-hostname.com/"); |
38 map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_IMAGES, ""); | 38 map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_IMAGES, std::string()); |
39 } | 39 } |
OLD | NEW |