| 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/content_settings_pref_provider.h" | 5 #include "chrome/browser/content_settings/content_settings_pref_provider.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 "chrome/browser/content_settings/stub_settings_observer.h" | 9 #include "chrome/browser/content_settings/stub_settings_observer.h" |
| 10 #include "chrome/browser/prefs/browser_prefs.h" | 10 #include "chrome/browser/prefs/browser_prefs.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 PrefStore* managed_cloud_prefs, | 29 PrefStore* managed_cloud_prefs, |
| 30 PrefStore* extension_prefs, | 30 PrefStore* extension_prefs, |
| 31 PrefStore* command_line_prefs, | 31 PrefStore* command_line_prefs, |
| 32 PersistentPrefStore* user_prefs, | 32 PersistentPrefStore* user_prefs, |
| 33 PrefStore* recommended_platform_prefs, | 33 PrefStore* recommended_platform_prefs, |
| 34 PrefStore* recommended_cloud_prefs, | 34 PrefStore* recommended_cloud_prefs, |
| 35 DefaultPrefStore* default_store) | 35 DefaultPrefStore* default_store) |
| 36 : PrefService( | 36 : PrefService( |
| 37 managed_platform_prefs, managed_cloud_prefs, extension_prefs, | 37 managed_platform_prefs, managed_cloud_prefs, extension_prefs, |
| 38 command_line_prefs, user_prefs, recommended_platform_prefs, | 38 command_line_prefs, user_prefs, recommended_platform_prefs, |
| 39 recommended_cloud_prefs, default_store, NULL) {} | 39 recommended_cloud_prefs, default_store, false) {} |
| 40 virtual ~ContentSettingsPrefService() {} | 40 virtual ~ContentSettingsPrefService() {} |
| 41 }; | 41 }; |
| 42 } | 42 } |
| 43 | 43 |
| 44 namespace content_settings { | 44 namespace content_settings { |
| 45 | 45 |
| 46 class PrefDefaultProviderTest : public TestingBrowserProcessTest { | 46 class PrefDefaultProviderTest : public TestingBrowserProcessTest { |
| 47 public: | 47 public: |
| 48 PrefDefaultProviderTest() | 48 PrefDefaultProviderTest() |
| 49 : ui_thread_(BrowserThread::UI, &message_loop_) { | 49 : ui_thread_(BrowserThread::UI, &message_loop_) { |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 CONTENT_SETTING_BLOCK); | 339 CONTENT_SETTING_BLOCK); |
| 340 EXPECT_EQ(CONTENT_SETTING_BLOCK, | 340 EXPECT_EQ(CONTENT_SETTING_BLOCK, |
| 341 pref_content_settings_provider.GetContentSetting( | 341 pref_content_settings_provider.GetContentSetting( |
| 342 host, host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1)); | 342 host, host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1)); |
| 343 EXPECT_EQ(CONTENT_SETTING_DEFAULT, | 343 EXPECT_EQ(CONTENT_SETTING_DEFAULT, |
| 344 pref_content_settings_provider.GetContentSetting( | 344 pref_content_settings_provider.GetContentSetting( |
| 345 host, host, CONTENT_SETTINGS_TYPE_PLUGINS, resource2)); | 345 host, host, CONTENT_SETTINGS_TYPE_PLUGINS, resource2)); |
| 346 } | 346 } |
| 347 | 347 |
| 348 } // namespace content_settings | 348 } // namespace content_settings |
| OLD | NEW |