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

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

Issue 237693004: Fix NULL dereference if a extension subpermission is removed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add test Created 6 years, 8 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 | « no previous file | extensions/common/permissions/media_galleries_permission.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 "extensions/common/permissions/api_permission.h" 8 #include "extensions/common/permissions/api_permission.h"
9 #include "extensions/common/permissions/media_galleries_permission.h" 9 #include "extensions/common/permissions/media_galleries_permission.h"
10 #include "extensions/common/permissions/media_galleries_permission_data.h" 10 #include "extensions/common/permissions/media_galleries_permission_data.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 // Multiple unknown permissions. 152 // Multiple unknown permissions.
153 value.reset(new base::ListValue()); 153 value.reset(new base::ListValue());
154 value->AppendString("Unknown1"); 154 value->AppendString("Unknown1");
155 value->AppendString("Unknown2"); 155 value->AppendString("Unknown2");
156 EXPECT_TRUE(permission->FromValue(value.get(), &error, &unhandled)); 156 EXPECT_TRUE(permission->FromValue(value.get(), &error, &unhandled));
157 EXPECT_TRUE(error.empty()); 157 EXPECT_TRUE(error.empty());
158 EXPECT_EQ(2U, unhandled.size()); 158 EXPECT_EQ(2U, unhandled.size());
159 error.clear(); 159 error.clear();
160 unhandled.clear(); 160 unhandled.clear();
161
162 // Unnknown with a NULL argument.
163 value.reset(new base::ListValue());
164 value->AppendString("Unknown1");
165 EXPECT_FALSE(permission->FromValue(value.get(), &error, NULL));
166 EXPECT_FALSE(error.empty());
167 error.clear();
161 } 168 }
162 169
163 TEST(MediaGalleriesPermissionTest, Equal) { 170 TEST(MediaGalleriesPermissionTest, Equal) {
164 const APIPermissionInfo* permission_info = 171 const APIPermissionInfo* permission_info =
165 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries); 172 PermissionsInfo::GetInstance()->GetByID(APIPermission::kMediaGalleries);
166 173
167 scoped_ptr<APIPermission> permission1( 174 scoped_ptr<APIPermission> permission1(
168 permission_info->CreateAPIPermission()); 175 permission_info->CreateAPIPermission());
169 scoped_ptr<APIPermission> permission2( 176 scoped_ptr<APIPermission> permission2(
170 permission_info->CreateAPIPermission()); 177 permission_info->CreateAPIPermission());
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 279
273 vtmp = permission1->ToValue(); 280 vtmp = permission1->ToValue();
274 ASSERT_TRUE(vtmp); 281 ASSERT_TRUE(vtmp);
275 ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL, NULL)); 282 ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL, NULL));
276 EXPECT_TRUE(permission1->Equal(permission2.get())); 283 EXPECT_TRUE(permission1->Equal(permission2.get()));
277 } 284 }
278 285
279 } // namespace 286 } // namespace
280 287
281 } // namespace extensions 288 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | extensions/common/permissions/media_galleries_permission.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698