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

Side by Side Diff: extensions/common/api/sockets/sockets_manifest_permission_unittest.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « extensions/browser/user_script_loader.cc ('k') | extensions/common/extension_messages.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <set> 5 #include <set>
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "extensions/common/api/sockets/sockets_manifest_permission.h" 10 #include "extensions/common/api/sockets/sockets_manifest_permission.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 AssertEmptyPermission(intersect_perm.get()); 187 AssertEmptyPermission(intersect_perm.get());
188 188
189 // IPC 189 // IPC
190 scoped_ptr<SocketsManifestPermission> ipc_perm( 190 scoped_ptr<SocketsManifestPermission> ipc_perm(
191 new SocketsManifestPermission()); 191 new SocketsManifestPermission());
192 scoped_ptr<SocketsManifestPermission> ipc_perm2( 192 scoped_ptr<SocketsManifestPermission> ipc_perm2(
193 new SocketsManifestPermission()); 193 new SocketsManifestPermission());
194 194
195 IPC::Message m; 195 IPC::Message m;
196 ipc_perm->Write(&m); 196 ipc_perm->Write(&m);
197 PickleIterator iter(m); 197 base::PickleIterator iter(m);
198 EXPECT_TRUE(ipc_perm2->Read(&m, &iter)); 198 EXPECT_TRUE(ipc_perm2->Read(&m, &iter));
199 AssertEmptyPermission(ipc_perm2.get()); 199 AssertEmptyPermission(ipc_perm2.get());
200 } 200 }
201 201
202 TEST(SocketsManifestPermissionTest, JSONFormats) { 202 TEST(SocketsManifestPermissionTest, JSONFormats) {
203 EXPECT_TRUE(CheckFormat( 203 EXPECT_TRUE(CheckFormat(
204 "{\"udp\":{\"send\":\"\"}}", 204 "{\"udp\":{\"send\":\"\"}}",
205 CheckFormatEntry(SocketPermissionRequest::UDP_SEND_TO, "*:*"))); 205 CheckFormatEntry(SocketPermissionRequest::UDP_SEND_TO, "*:*")));
206 EXPECT_TRUE(CheckFormat("{\"udp\":{\"send\":[]}}")); 206 EXPECT_TRUE(CheckFormat("{\"udp\":{\"send\":[]}}"));
207 EXPECT_TRUE(CheckFormat( 207 EXPECT_TRUE(CheckFormat(
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 scoped_ptr<SocketsManifestPermission> permission( 392 scoped_ptr<SocketsManifestPermission> permission(
393 PermissionFromJSON(kUdpBindPermission)); 393 PermissionFromJSON(kUdpBindPermission));
394 394
395 scoped_ptr<SocketsManifestPermission> ipc_perm( 395 scoped_ptr<SocketsManifestPermission> ipc_perm(
396 static_cast<SocketsManifestPermission*>(permission->Clone())); 396 static_cast<SocketsManifestPermission*>(permission->Clone()));
397 scoped_ptr<SocketsManifestPermission> ipc_perm2( 397 scoped_ptr<SocketsManifestPermission> ipc_perm2(
398 new SocketsManifestPermission()); 398 new SocketsManifestPermission());
399 399
400 IPC::Message m; 400 IPC::Message m;
401 ipc_perm->Write(&m); 401 ipc_perm->Write(&m);
402 PickleIterator iter(m); 402 base::PickleIterator iter(m);
403 EXPECT_TRUE(ipc_perm2->Read(&m, &iter)); 403 EXPECT_TRUE(ipc_perm2->Read(&m, &iter));
404 EXPECT_TRUE(permission->Equal(ipc_perm2.get())); 404 EXPECT_TRUE(permission->Equal(ipc_perm2.get()));
405 } 405 }
406 406
407 } // namespace extensions 407 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/browser/user_script_loader.cc ('k') | extensions/common/extension_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698