Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2454)

Unified Diff: chrome/browser/content_settings/content_settings_provider_unittest.cc

Issue 7831004: Add a method to the content_settings::ProviderInterface to return the content settings Value. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/content_settings/content_settings_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_provider_unittest.cc b/chrome/browser/content_settings/content_settings_provider_unittest.cc
index 31554306d6d0057d1f37f9f83d360cd8b757aaa8..0b67be43b8a29fff669d40f0a19570ad59171af1 100644
--- a/chrome/browser/content_settings/content_settings_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_provider_unittest.cc
@@ -4,6 +4,7 @@
#include "testing/gtest/include/gtest/gtest.h"
+#include "base/memory/scoped_ptr.h"
#include "chrome/browser/content_settings/content_settings_mock_provider.h"
#include "googleurl/src/gurl.h"
@@ -40,10 +41,20 @@ TEST(ContentSettingsProviderTest, Mock) {
EXPECT_EQ(CONTENT_SETTING_BLOCK, mock_provider.GetContentSetting(
url, url, CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin"));
+ scoped_ptr<Value> value_ptr(mock_provider.GetContentSettingValue(
+ url, url, CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin"));
+ int int_value = -1;
+ value_ptr->GetAsInteger(&int_value);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, IntToContentSetting(int_value));
+
EXPECT_EQ(CONTENT_SETTING_DEFAULT, mock_provider.GetContentSetting(
url, url, CONTENT_SETTINGS_TYPE_PLUGINS, "flash_plugin"));
+ EXPECT_EQ(NULL, mock_provider.GetContentSettingValue(
+ url, url, CONTENT_SETTINGS_TYPE_PLUGINS, "flash_plugin"));
EXPECT_EQ(CONTENT_SETTING_DEFAULT, mock_provider.GetContentSetting(
url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
+ EXPECT_EQ(NULL, mock_provider.GetContentSettingValue(
+ url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
mock_provider.SetContentSetting(
pattern,
« no previous file with comments | « chrome/browser/content_settings/content_settings_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698