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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/common/extensions/permissions/media_galleries_permission_unittest.cc

Issue 141743005: Extensions: Make it possible for permission parsing code to return a detailed error message. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 10 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
« no previous file with comments | « chrome/common/extensions/permissions/media_galleries_permission.cc ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 // These tests make sure MediaGalleriesPermission values are parsed correctly. 5 // These tests make sure MediaGalleriesPermission values are parsed correctly.
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/common/extensions/permissions/media_galleries_permission.h" 8 #include "chrome/common/extensions/permissions/media_galleries_permission.h"
9 #include "chrome/common/extensions/permissions/media_galleries_permission_data.h " 9 #include "chrome/common/extensions/permissions/media_galleries_permission_data.h "
10 #include "extensions/common/permissions/api_permission.h" 10 #include "extensions/common/permissions/api_permission.h"
11 #include "extensions/common/permissions/permissions_info.h" 11 #include "extensions/common/permissions/permissions_info.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 using content::SocketPermissionRequest; 14 using content::SocketPermissionRequest;
15 using extensions::SocketPermissionData; 15 using extensions::SocketPermissionData;
16 16
17 namespace extensions { 17 namespace extensions {
18 18
19 namespace { 19 namespace {
20 20
21 TEST(MediaGalleriesPermissionTest, GoodValues) { 21 TEST(MediaGalleriesPermissionTest, GoodValues) {
22 std::string error;
22 const APIPermissionInfo* permission_info = 23 const APIPermissionInfo* permission_info =
23 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries); 24 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
24 25
25 scoped_ptr<APIPermission> permission( 26 scoped_ptr<APIPermission> permission(
26 permission_info->CreateAPIPermission()); 27 permission_info->CreateAPIPermission());
27 28
28 // access_type + all_detected 29 // access_type + all_detected
29 scoped_ptr<base::ListValue> value(new base::ListValue()); 30 scoped_ptr<base::ListValue> value(new base::ListValue());
30 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 31 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
31 value->AppendString(MediaGalleriesPermission::kReadPermission); 32 value->AppendString(MediaGalleriesPermission::kReadPermission);
32 EXPECT_TRUE(permission->FromValue(value.get())); 33 EXPECT_TRUE(permission->FromValue(value.get(), &error));
34 EXPECT_TRUE(error.empty());
35 error.clear();
33 36
34 value.reset(new base::ListValue()); 37 value.reset(new base::ListValue());
35 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 38 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
36 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 39 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
37 value->AppendString(MediaGalleriesPermission::kReadPermission); 40 value->AppendString(MediaGalleriesPermission::kReadPermission);
38 value->AppendString(MediaGalleriesPermission::kDeletePermission); 41 value->AppendString(MediaGalleriesPermission::kDeletePermission);
39 EXPECT_TRUE(permission->FromValue(value.get())); 42 EXPECT_TRUE(permission->FromValue(value.get(), &error));
43 EXPECT_TRUE(error.empty());
44 error.clear();
40 45
41 // all_detected 46 // all_detected
42 value.reset(new base::ListValue()); 47 value.reset(new base::ListValue());
43 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 48 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
44 EXPECT_TRUE(permission->FromValue(value.get())); 49 EXPECT_TRUE(permission->FromValue(value.get(), &error));
50 EXPECT_TRUE(error.empty());
51 error.clear();
45 52
46 // access_type 53 // access_type
47 value.reset(new base::ListValue()); 54 value.reset(new base::ListValue());
48 value->AppendString(MediaGalleriesPermission::kReadPermission); 55 value->AppendString(MediaGalleriesPermission::kReadPermission);
49 EXPECT_TRUE(permission->FromValue(value.get())); 56 EXPECT_TRUE(permission->FromValue(value.get(), &error));
57 EXPECT_TRUE(error.empty());
58 error.clear();
50 59
51 value.reset(new base::ListValue()); 60 value.reset(new base::ListValue());
52 value->AppendString(MediaGalleriesPermission::kDeletePermission); 61 value->AppendString(MediaGalleriesPermission::kDeletePermission);
53 value->AppendString(MediaGalleriesPermission::kReadPermission); 62 value->AppendString(MediaGalleriesPermission::kReadPermission);
54 EXPECT_TRUE(permission->FromValue(value.get())); 63 EXPECT_TRUE(permission->FromValue(value.get(), &error));
64 EXPECT_TRUE(error.empty());
65 error.clear();
55 66
56 value.reset(new base::ListValue()); 67 value.reset(new base::ListValue());
57 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 68 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
58 value->AppendString(MediaGalleriesPermission::kDeletePermission); 69 value->AppendString(MediaGalleriesPermission::kDeletePermission);
59 value->AppendString(MediaGalleriesPermission::kReadPermission); 70 value->AppendString(MediaGalleriesPermission::kReadPermission);
60 EXPECT_TRUE(permission->FromValue(value.get())); 71 EXPECT_TRUE(permission->FromValue(value.get(), &error));
72 EXPECT_TRUE(error.empty());
73 error.clear();
61 74
62 // Repeats do not make a difference. 75 // Repeats do not make a difference.
63 value.reset(new base::ListValue()); 76 value.reset(new base::ListValue());
64 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 77 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
65 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 78 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
66 EXPECT_TRUE(permission->FromValue(value.get())); 79 EXPECT_TRUE(permission->FromValue(value.get(), &error));
80 EXPECT_TRUE(error.empty());
81 error.clear();
67 82
68 value.reset(new base::ListValue()); 83 value.reset(new base::ListValue());
69 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 84 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
70 value->AppendString(MediaGalleriesPermission::kReadPermission); 85 value->AppendString(MediaGalleriesPermission::kReadPermission);
71 value->AppendString(MediaGalleriesPermission::kReadPermission); 86 value->AppendString(MediaGalleriesPermission::kReadPermission);
72 value->AppendString(MediaGalleriesPermission::kDeletePermission); 87 value->AppendString(MediaGalleriesPermission::kDeletePermission);
73 value->AppendString(MediaGalleriesPermission::kDeletePermission); 88 value->AppendString(MediaGalleriesPermission::kDeletePermission);
74 value->AppendString(MediaGalleriesPermission::kDeletePermission); 89 value->AppendString(MediaGalleriesPermission::kDeletePermission);
75 EXPECT_TRUE(permission->FromValue(value.get())); 90 EXPECT_TRUE(permission->FromValue(value.get(), &error));
91 EXPECT_TRUE(error.empty());
92 error.clear();
76 } 93 }
77 94
78 TEST(MediaGalleriesPermissionTest, BadValues) { 95 TEST(MediaGalleriesPermissionTest, BadValues) {
96 std::string error;
79 const APIPermissionInfo* permission_info = 97 const APIPermissionInfo* permission_info =
80 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries); 98 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
81 99
82 scoped_ptr<APIPermission> permission(permission_info->CreateAPIPermission()); 100 scoped_ptr<APIPermission> permission(permission_info->CreateAPIPermission());
83 101
84 // Empty 102 // Empty
85 scoped_ptr<base::ListValue> value(new base::ListValue()); 103 scoped_ptr<base::ListValue> value(new base::ListValue());
86 EXPECT_FALSE(permission->FromValue(value.get())); 104 EXPECT_FALSE(permission->FromValue(value.get(), &error));
105 EXPECT_FALSE(error.empty());
106 error.clear();
87 107
88 // copyTo and delete without read 108 // copyTo and delete without read
89 value.reset(new base::ListValue()); 109 value.reset(new base::ListValue());
90 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 110 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
91 EXPECT_FALSE(permission->FromValue(value.get())); 111 EXPECT_FALSE(permission->FromValue(value.get(), &error));
112 EXPECT_FALSE(error.empty());
113 error.clear();
92 114
93 value.reset(new base::ListValue()); 115 value.reset(new base::ListValue());
94 value->AppendString(MediaGalleriesPermission::kDeletePermission); 116 value->AppendString(MediaGalleriesPermission::kDeletePermission);
95 EXPECT_FALSE(permission->FromValue(value.get())); 117 EXPECT_FALSE(permission->FromValue(value.get(), &error));
118 EXPECT_FALSE(error.empty());
119 error.clear();
96 120
97 value.reset(new base::ListValue()); 121 value.reset(new base::ListValue());
98 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 122 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
99 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 123 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
100 value->AppendString(MediaGalleriesPermission::kDeletePermission); 124 value->AppendString(MediaGalleriesPermission::kDeletePermission);
101 EXPECT_FALSE(permission->FromValue(value.get())); 125 EXPECT_FALSE(permission->FromValue(value.get(), &error));
126 EXPECT_FALSE(error.empty());
127 error.clear();
102 128
103 // copyTo without delete 129 // copyTo without delete
104 value.reset(new base::ListValue()); 130 value.reset(new base::ListValue());
105 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 131 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
106 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 132 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
107 value->AppendString(MediaGalleriesPermission::kReadPermission); 133 value->AppendString(MediaGalleriesPermission::kReadPermission);
108 EXPECT_FALSE(permission->FromValue(value.get())); 134 EXPECT_FALSE(permission->FromValue(value.get(), &error));
135 EXPECT_FALSE(error.empty());
136 error.clear();
109 137
110 // Repeats do not make a difference. 138 // Repeats do not make a difference.
111 value.reset(new base::ListValue()); 139 value.reset(new base::ListValue());
112 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 140 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
113 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 141 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
114 EXPECT_FALSE(permission->FromValue(value.get())); 142 EXPECT_FALSE(permission->FromValue(value.get(), &error));
143 EXPECT_FALSE(error.empty());
144 error.clear();
115 145
116 value.reset(new base::ListValue()); 146 value.reset(new base::ListValue());
117 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 147 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
118 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 148 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
119 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 149 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
120 value->AppendString(MediaGalleriesPermission::kDeletePermission); 150 value->AppendString(MediaGalleriesPermission::kDeletePermission);
121 value->AppendString(MediaGalleriesPermission::kDeletePermission); 151 value->AppendString(MediaGalleriesPermission::kDeletePermission);
122 EXPECT_FALSE(permission->FromValue(value.get())); 152 EXPECT_FALSE(permission->FromValue(value.get(), &error));
153 EXPECT_FALSE(error.empty());
154 error.clear();
123 } 155 }
124 156
125 TEST(MediaGalleriesPermissionTest, Equal) { 157 TEST(MediaGalleriesPermissionTest, Equal) {
126 const APIPermissionInfo* permission_info = 158 const APIPermissionInfo* permission_info =
127 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries); 159 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
128 160
129 scoped_ptr<APIPermission> permission1( 161 scoped_ptr<APIPermission> permission1(
130 permission_info->CreateAPIPermission()); 162 permission_info->CreateAPIPermission());
131 scoped_ptr<APIPermission> permission2( 163 scoped_ptr<APIPermission> permission2(
132 permission_info->CreateAPIPermission()); 164 permission_info->CreateAPIPermission());
133 165
134 scoped_ptr<base::ListValue> value(new base::ListValue()); 166 scoped_ptr<base::ListValue> value(new base::ListValue());
135 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 167 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
136 value->AppendString(MediaGalleriesPermission::kReadPermission); 168 value->AppendString(MediaGalleriesPermission::kReadPermission);
137 ASSERT_TRUE(permission1->FromValue(value.get())); 169 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
138 170
139 value.reset(new base::ListValue()); 171 value.reset(new base::ListValue());
140 value->AppendString(MediaGalleriesPermission::kReadPermission); 172 value->AppendString(MediaGalleriesPermission::kReadPermission);
141 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 173 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
142 ASSERT_TRUE(permission2->FromValue(value.get())); 174 ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
143 EXPECT_TRUE(permission1->Equal(permission2.get())); 175 EXPECT_TRUE(permission1->Equal(permission2.get()));
144 176
145 value.reset(new base::ListValue()); 177 value.reset(new base::ListValue());
146 value->AppendString(MediaGalleriesPermission::kReadPermission); 178 value->AppendString(MediaGalleriesPermission::kReadPermission);
147 value->AppendString(MediaGalleriesPermission::kReadPermission); 179 value->AppendString(MediaGalleriesPermission::kReadPermission);
148 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 180 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
149 ASSERT_TRUE(permission2->FromValue(value.get())); 181 ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
150 EXPECT_TRUE(permission1->Equal(permission2.get())); 182 EXPECT_TRUE(permission1->Equal(permission2.get()));
151 183
152 value.reset(new base::ListValue()); 184 value.reset(new base::ListValue());
153 value->AppendString(MediaGalleriesPermission::kReadPermission); 185 value->AppendString(MediaGalleriesPermission::kReadPermission);
154 value->AppendString(MediaGalleriesPermission::kDeletePermission); 186 value->AppendString(MediaGalleriesPermission::kDeletePermission);
155 ASSERT_TRUE(permission1->FromValue(value.get())); 187 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
156 188
157 value.reset(new base::ListValue()); 189 value.reset(new base::ListValue());
158 value->AppendString(MediaGalleriesPermission::kDeletePermission); 190 value->AppendString(MediaGalleriesPermission::kDeletePermission);
159 value->AppendString(MediaGalleriesPermission::kReadPermission); 191 value->AppendString(MediaGalleriesPermission::kReadPermission);
160 ASSERT_TRUE(permission2->FromValue(value.get())); 192 ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
161 EXPECT_TRUE(permission1->Equal(permission2.get())); 193 EXPECT_TRUE(permission1->Equal(permission2.get()));
162 194
163 value.reset(new base::ListValue()); 195 value.reset(new base::ListValue());
164 value->AppendString(MediaGalleriesPermission::kReadPermission); 196 value->AppendString(MediaGalleriesPermission::kReadPermission);
165 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 197 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
166 value->AppendString(MediaGalleriesPermission::kDeletePermission); 198 value->AppendString(MediaGalleriesPermission::kDeletePermission);
167 ASSERT_TRUE(permission1->FromValue(value.get())); 199 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
168 200
169 value.reset(new base::ListValue()); 201 value.reset(new base::ListValue());
170 value->AppendString(MediaGalleriesPermission::kDeletePermission); 202 value->AppendString(MediaGalleriesPermission::kDeletePermission);
171 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 203 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
172 value->AppendString(MediaGalleriesPermission::kReadPermission); 204 value->AppendString(MediaGalleriesPermission::kReadPermission);
173 ASSERT_TRUE(permission2->FromValue(value.get())); 205 ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
174 EXPECT_TRUE(permission1->Equal(permission2.get())); 206 EXPECT_TRUE(permission1->Equal(permission2.get()));
175 } 207 }
176 208
177 TEST(MediaGalleriesPermissionTest, NotEqual) { 209 TEST(MediaGalleriesPermissionTest, NotEqual) {
178 const APIPermissionInfo* permission_info = 210 const APIPermissionInfo* permission_info =
179 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries); 211 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
180 212
181 scoped_ptr<APIPermission> permission1( 213 scoped_ptr<APIPermission> permission1(
182 permission_info->CreateAPIPermission()); 214 permission_info->CreateAPIPermission());
183 scoped_ptr<APIPermission> permission2( 215 scoped_ptr<APIPermission> permission2(
184 permission_info->CreateAPIPermission()); 216 permission_info->CreateAPIPermission());
185 217
186 scoped_ptr<base::ListValue> value(new base::ListValue()); 218 scoped_ptr<base::ListValue> value(new base::ListValue());
187 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 219 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
188 value->AppendString(MediaGalleriesPermission::kReadPermission); 220 value->AppendString(MediaGalleriesPermission::kReadPermission);
189 ASSERT_TRUE(permission1->FromValue(value.get())); 221 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
190 222
191 value.reset(new base::ListValue()); 223 value.reset(new base::ListValue());
192 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 224 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
193 value->AppendString(MediaGalleriesPermission::kReadPermission); 225 value->AppendString(MediaGalleriesPermission::kReadPermission);
194 value->AppendString(MediaGalleriesPermission::kDeletePermission); 226 value->AppendString(MediaGalleriesPermission::kDeletePermission);
195 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 227 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
196 ASSERT_TRUE(permission2->FromValue(value.get())); 228 ASSERT_TRUE(permission2->FromValue(value.get(), NULL));
197 EXPECT_FALSE(permission1->Equal(permission2.get())); 229 EXPECT_FALSE(permission1->Equal(permission2.get()));
198 } 230 }
199 231
200 TEST(MediaGalleriesPermissionTest, ToFromValue) { 232 TEST(MediaGalleriesPermissionTest, ToFromValue) {
201 const APIPermissionInfo* permission_info = 233 const APIPermissionInfo* permission_info =
202 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries); 234 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
203 235
204 scoped_ptr<APIPermission> permission1( 236 scoped_ptr<APIPermission> permission1(
205 permission_info->CreateAPIPermission()); 237 permission_info->CreateAPIPermission());
206 scoped_ptr<APIPermission> permission2( 238 scoped_ptr<APIPermission> permission2(
207 permission_info->CreateAPIPermission()); 239 permission_info->CreateAPIPermission());
208 240
209 scoped_ptr<base::ListValue> value(new base::ListValue()); 241 scoped_ptr<base::ListValue> value(new base::ListValue());
210 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission); 242 value->AppendString(MediaGalleriesPermission::kAllAutoDetectedPermission);
211 value->AppendString(MediaGalleriesPermission::kReadPermission); 243 value->AppendString(MediaGalleriesPermission::kReadPermission);
212 ASSERT_TRUE(permission1->FromValue(value.get())); 244 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
213 245
214 scoped_ptr<base::Value> vtmp(permission1->ToValue()); 246 scoped_ptr<base::Value> vtmp(permission1->ToValue());
215 ASSERT_TRUE(vtmp); 247 ASSERT_TRUE(vtmp);
216 ASSERT_TRUE(permission2->FromValue(vtmp.get())); 248 ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL));
217 EXPECT_TRUE(permission1->Equal(permission2.get())); 249 EXPECT_TRUE(permission1->Equal(permission2.get()));
218 250
219 value.reset(new base::ListValue()); 251 value.reset(new base::ListValue());
220 value->AppendString(MediaGalleriesPermission::kReadPermission); 252 value->AppendString(MediaGalleriesPermission::kReadPermission);
221 value->AppendString(MediaGalleriesPermission::kDeletePermission); 253 value->AppendString(MediaGalleriesPermission::kDeletePermission);
222 value->AppendString(MediaGalleriesPermission::kCopyToPermission); 254 value->AppendString(MediaGalleriesPermission::kCopyToPermission);
223 ASSERT_TRUE(permission1->FromValue(value.get())); 255 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
224 256
225 vtmp = permission1->ToValue(); 257 vtmp = permission1->ToValue();
226 ASSERT_TRUE(vtmp); 258 ASSERT_TRUE(vtmp);
227 ASSERT_TRUE(permission2->FromValue(vtmp.get())); 259 ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL));
228 EXPECT_TRUE(permission1->Equal(permission2.get())); 260 EXPECT_TRUE(permission1->Equal(permission2.get()));
229 261
230 value.reset(new base::ListValue()); 262 value.reset(new base::ListValue());
231 value->AppendString(MediaGalleriesPermission::kReadPermission); 263 value->AppendString(MediaGalleriesPermission::kReadPermission);
232 value->AppendString(MediaGalleriesPermission::kDeletePermission); 264 value->AppendString(MediaGalleriesPermission::kDeletePermission);
233 ASSERT_TRUE(permission1->FromValue(value.get())); 265 ASSERT_TRUE(permission1->FromValue(value.get(), NULL));
234 266
235 vtmp = permission1->ToValue(); 267 vtmp = permission1->ToValue();
236 ASSERT_TRUE(vtmp); 268 ASSERT_TRUE(vtmp);
237 ASSERT_TRUE(permission2->FromValue(vtmp.get())); 269 ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL));
238 EXPECT_TRUE(permission1->Equal(permission2.get())); 270 EXPECT_TRUE(permission1->Equal(permission2.get()));
239 } 271 }
240 272
241 } // namespace 273 } // namespace
242 274
243 } // namespace extensions 275 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/common/extensions/permissions/media_galleries_permission.cc ('k') | chrome/common/extensions/permissions/permission_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698