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

Side by Side Diff: chrome/browser/content_settings/content_settings_provider_unittest.cc

Issue 385263004: Get rid of some uses of CreateIntegerValue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/content_settings/content_settings_mock_provider.h" 8 #include "chrome/browser/content_settings/content_settings_mock_provider.h"
9 #include "chrome/browser/content_settings/content_settings_utils.h" 9 #include "chrome/browser/content_settings/content_settings_utils.h"
10 #include "url/gurl.h" 10 #include "url/gurl.h"
11 11
12 namespace content_settings { 12 namespace content_settings {
13 13
14 TEST(ContentSettingsProviderTest, Mock) { 14 TEST(ContentSettingsProviderTest, Mock) {
15 ContentSettingsPattern pattern = 15 ContentSettingsPattern pattern =
16 ContentSettingsPattern::FromString("[*.]youtube.com"); 16 ContentSettingsPattern::FromString("[*.]youtube.com");
17 GURL url("http://www.youtube.com"); 17 GURL url("http://www.youtube.com");
18 18
19 MockProvider mock_provider(false); 19 MockProvider mock_provider(false);
20 mock_provider.SetWebsiteSetting( 20 mock_provider.SetWebsiteSetting(
21 pattern, 21 pattern,
22 pattern, 22 pattern,
23 CONTENT_SETTINGS_TYPE_PLUGINS, 23 CONTENT_SETTINGS_TYPE_PLUGINS,
24 "java_plugin", 24 "java_plugin",
25 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 25 new base::FundamentalValue(CONTENT_SETTING_BLOCK));
26
27 26
28 EXPECT_EQ(CONTENT_SETTING_BLOCK, 27 EXPECT_EQ(CONTENT_SETTING_BLOCK,
29 GetContentSetting(&mock_provider, url, url, 28 GetContentSetting(&mock_provider, url, url,
30 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", 29 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin",
31 false)); 30 false));
32 scoped_ptr<base::Value> value_ptr( 31 scoped_ptr<base::Value> value_ptr(
33 GetContentSettingValue(&mock_provider, url, url, 32 GetContentSettingValue(&mock_provider, url, url,
34 CONTENT_SETTINGS_TYPE_PLUGINS, 33 CONTENT_SETTINGS_TYPE_PLUGINS,
35 "java_plugin", false)); 34 "java_plugin", false));
36 int int_value = -1; 35 int int_value = -1;
(...skipping 21 matching lines...) Expand all
58 url, 57 url,
59 CONTENT_SETTINGS_TYPE_GEOLOCATION, 58 CONTENT_SETTINGS_TYPE_GEOLOCATION,
60 std::string(), 59 std::string(),
61 false)); 60 false));
62 61
63 bool owned = mock_provider.SetWebsiteSetting( 62 bool owned = mock_provider.SetWebsiteSetting(
64 pattern, 63 pattern,
65 pattern, 64 pattern,
66 CONTENT_SETTINGS_TYPE_PLUGINS, 65 CONTENT_SETTINGS_TYPE_PLUGINS,
67 "java_plugin", 66 "java_plugin",
68 base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW)); 67 new base::FundamentalValue(CONTENT_SETTING_ALLOW));
69 EXPECT_TRUE(owned); 68 EXPECT_TRUE(owned);
70 EXPECT_EQ(CONTENT_SETTING_ALLOW, 69 EXPECT_EQ(CONTENT_SETTING_ALLOW,
71 GetContentSetting(&mock_provider, url, url, 70 GetContentSetting(&mock_provider, url, url,
72 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", 71 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin",
73 false)); 72 false));
74 73
75 mock_provider.set_read_only(true); 74 mock_provider.set_read_only(true);
76 scoped_ptr<base::Value> value( 75 scoped_ptr<base::Value> value(
77 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 76 new base::FundamentalValue(CONTENT_SETTING_BLOCK));
78 owned = mock_provider.SetWebsiteSetting( 77 owned = mock_provider.SetWebsiteSetting(
79 pattern, 78 pattern,
80 pattern, 79 pattern,
81 CONTENT_SETTINGS_TYPE_PLUGINS, 80 CONTENT_SETTINGS_TYPE_PLUGINS,
82 "java_plugin", 81 "java_plugin",
83 value.get()); 82 value.get());
84 EXPECT_FALSE(owned); 83 EXPECT_FALSE(owned);
85 EXPECT_EQ(CONTENT_SETTING_ALLOW, 84 EXPECT_EQ(CONTENT_SETTING_ALLOW,
86 GetContentSetting(&mock_provider, url, url, 85 GetContentSetting(&mock_provider, url, url,
87 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", 86 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin",
88 false)); 87 false));
89 88
90 EXPECT_TRUE(mock_provider.read_only()); 89 EXPECT_TRUE(mock_provider.read_only());
91 90
92 mock_provider.set_read_only(false); 91 mock_provider.set_read_only(false);
93 owned = mock_provider.SetWebsiteSetting( 92 owned = mock_provider.SetWebsiteSetting(
94 pattern, 93 pattern,
95 pattern, 94 pattern,
96 CONTENT_SETTINGS_TYPE_PLUGINS, 95 CONTENT_SETTINGS_TYPE_PLUGINS,
97 "java_plugin", 96 "java_plugin",
98 base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); 97 new base::FundamentalValue(CONTENT_SETTING_BLOCK));
99 EXPECT_TRUE(owned); 98 EXPECT_TRUE(owned);
100 EXPECT_EQ(CONTENT_SETTING_BLOCK, 99 EXPECT_EQ(CONTENT_SETTING_BLOCK,
101 GetContentSetting(&mock_provider, url, url, 100 GetContentSetting(&mock_provider, url, url,
102 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin", 101 CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin",
103 false)); 102 false));
104 } 103 }
105 104
106 } // namespace content_settings 105 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698