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

Side by Side Diff: extensions/common/permissions/socket_permission_unittest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/pickle.h" 7 #include "base/pickle.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "extensions/common/permissions/permissions_info.h" 9 #include "extensions/common/permissions/permissions_info.h"
10 #include "extensions/common/permissions/socket_permission.h" 10 #include "extensions/common/permissions/socket_permission.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 scoped_ptr<APIPermission> permission1( 287 scoped_ptr<APIPermission> permission1(
288 permission_info->CreateAPIPermission()); 288 permission_info->CreateAPIPermission());
289 scoped_ptr<APIPermission> permission2( 289 scoped_ptr<APIPermission> permission2(
290 permission_info->CreateAPIPermission()); 290 permission_info->CreateAPIPermission());
291 291
292 scoped_ptr<base::ListValue> value(new base::ListValue()); 292 scoped_ptr<base::ListValue> value(new base::ListValue());
293 value->AppendString("tcp-connect:*.example.com:80"); 293 value->AppendString("tcp-connect:*.example.com:80");
294 value->AppendString("udp-bind::8080"); 294 value->AppendString("udp-bind::8080");
295 value->AppendString("udp-send-to::8888"); 295 value->AppendString("udp-send-to::8888");
296 ASSERT_TRUE(permission1->FromValue(value.get(), NULL, NULL)); 296 ASSERT_TRUE(permission1->FromValue(value.get(), nullptr, NULL));
297 297
298 EXPECT_FALSE(permission1->Equal(permission2.get())); 298 EXPECT_FALSE(permission1->Equal(permission2.get()));
299 299
300 permission1->Write(&m); 300 permission1->Write(&m);
301 PickleIterator iter(m); 301 PickleIterator iter(m);
302 permission2->Read(&m, &iter); 302 permission2->Read(&m, &iter);
303 EXPECT_TRUE(permission1->Equal(permission2.get())); 303 EXPECT_TRUE(permission1->Equal(permission2.get()));
304 } 304 }
305 } 305 }
306 306
307 TEST(SocketPermissionTest, Value) { 307 TEST(SocketPermissionTest, Value) {
308 const APIPermissionInfo* permission_info = 308 const APIPermissionInfo* permission_info =
309 PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket); 309 PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
310 310
311 scoped_ptr<APIPermission> permission1(permission_info->CreateAPIPermission()); 311 scoped_ptr<APIPermission> permission1(permission_info->CreateAPIPermission());
312 scoped_ptr<APIPermission> permission2(permission_info->CreateAPIPermission()); 312 scoped_ptr<APIPermission> permission2(permission_info->CreateAPIPermission());
313 313
314 scoped_ptr<base::ListValue> value(new base::ListValue()); 314 scoped_ptr<base::ListValue> value(new base::ListValue());
315 value->AppendString("tcp-connect:*.example.com:80"); 315 value->AppendString("tcp-connect:*.example.com:80");
316 value->AppendString("udp-bind::8080"); 316 value->AppendString("udp-bind::8080");
317 value->AppendString("udp-send-to::8888"); 317 value->AppendString("udp-send-to::8888");
318 ASSERT_TRUE(permission1->FromValue(value.get(), NULL, NULL)); 318 ASSERT_TRUE(permission1->FromValue(value.get(), nullptr, NULL));
319 319
320 EXPECT_FALSE(permission1->Equal(permission2.get())); 320 EXPECT_FALSE(permission1->Equal(permission2.get()));
321 321
322 scoped_ptr<base::Value> vtmp(permission1->ToValue()); 322 scoped_ptr<base::Value> vtmp(permission1->ToValue());
323 ASSERT_TRUE(vtmp); 323 ASSERT_TRUE(vtmp);
324 ASSERT_TRUE(permission2->FromValue(vtmp.get(), NULL, NULL)); 324 ASSERT_TRUE(permission2->FromValue(vtmp.get(), nullptr, NULL));
325 EXPECT_TRUE(permission1->Equal(permission2.get())); 325 EXPECT_TRUE(permission1->Equal(permission2.get()));
326 } 326 }
327 327
328 } // namespace 328 } // namespace
329 329
330 } // namespace extensions 330 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698