summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'extensions')
-rw-r--r--extensions/browser/sandboxed_unpacker.cc4
-rw-r--r--extensions/browser/script_executor.cc2
-rw-r--r--extensions/browser/user_script_loader.cc2
-rw-r--r--extensions/common/api/sockets/sockets_manifest_permission_unittest.cc4
-rw-r--r--extensions/common/extension_messages.cc41
-rw-r--r--extensions/common/permissions/api_permission.cc2
-rw-r--r--extensions/common/permissions/api_permission_set_unittest.cc2
-rw-r--r--extensions/common/permissions/manifest_permission.cc3
-rw-r--r--extensions/common/permissions/settings_override_permission.cc2
-rw-r--r--extensions/common/permissions/socket_permission_unittest.cc4
-rw-r--r--extensions/common/user_script.h3
-rw-r--r--extensions/common/user_script_unittest.cc4
-rw-r--r--extensions/renderer/user_script_set.cc13
13 files changed, 49 insertions, 37 deletions
diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc
index 38a7cd9a..8b17160 100644
--- a/extensions/browser/sandboxed_unpacker.cc
+++ b/extensions/browser/sandboxed_unpacker.cc
@@ -190,7 +190,7 @@ bool ReadImagesFromFile(const base::FilePath& extension_path,
return false;
IPC::Message pickle(file_str.data(), file_str.size());
- PickleIterator iter(pickle);
+ base::PickleIterator iter(pickle);
return IPC::ReadParam(&pickle, &iter, images);
}
@@ -206,7 +206,7 @@ bool ReadMessageCatalogsFromFile(const base::FilePath& extension_path,
return false;
IPC::Message pickle(file_str.data(), file_str.size());
- PickleIterator iter(pickle);
+ base::PickleIterator iter(pickle);
return IPC::ReadParam(&pickle, &iter, catalogs);
}
diff --git a/extensions/browser/script_executor.cc b/extensions/browser/script_executor.cc
index 0502d89..6161f3c 100644
--- a/extensions/browser/script_executor.cc
+++ b/extensions/browser/script_executor.cc
@@ -73,7 +73,7 @@ class Handler : public content::WebContentsObserver {
return false;
int message_request_id;
- PickleIterator iter(message);
+ base::PickleIterator iter(message);
CHECK(iter.ReadInt(&message_request_id));
if (message_request_id != main_request_id_ &&
diff --git a/extensions/browser/user_script_loader.cc b/extensions/browser/user_script_loader.cc
index 4407093..047080a 100644
--- a/extensions/browser/user_script_loader.cc
+++ b/extensions/browser/user_script_loader.cc
@@ -275,7 +275,7 @@ void UserScriptLoader::StartLoad() {
// static
scoped_ptr<base::SharedMemory> UserScriptLoader::Serialize(
const UserScriptList& scripts) {
- Pickle pickle;
+ base::Pickle pickle;
pickle.WriteSizeT(scripts.size());
for (const UserScript& script : scripts) {
// TODO(aa): This can be replaced by sending content script metadata to
diff --git a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
index 419ddd7..4b2dbcf 100644
--- a/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
+++ b/extensions/common/api/sockets/sockets_manifest_permission_unittest.cc
@@ -194,7 +194,7 @@ TEST(SocketsManifestPermissionTest, Empty) {
IPC::Message m;
ipc_perm->Write(&m);
- PickleIterator iter(m);
+ base::PickleIterator iter(m);
EXPECT_TRUE(ipc_perm2->Read(&m, &iter));
AssertEmptyPermission(ipc_perm2.get());
}
@@ -399,7 +399,7 @@ TEST(SocketsManifestPermissionTest, IPC) {
IPC::Message m;
ipc_perm->Write(&m);
- PickleIterator iter(m);
+ base::PickleIterator iter(m);
EXPECT_TRUE(ipc_perm2->Read(&m, &iter));
EXPECT_TRUE(permission->Equal(ipc_perm2.get()));
}
diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc
index e7fdb51..42e25f4 100644
--- a/extensions/common/extension_messages.cc
+++ b/extensions/common/extension_messages.cc
@@ -95,7 +95,9 @@ struct ParamTraits<Manifest::Location> {
int val = static_cast<int>(p);
WriteParam(m, val);
}
- static bool Read(const Message* m, PickleIterator* iter, param_type* p) {
+ static bool Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* p) {
int val = 0;
if (!ReadParam(m, iter, &val) ||
val < Manifest::INVALID_LOCATION ||
@@ -114,7 +116,8 @@ void ParamTraits<URLPattern>::Write(Message* m, const param_type& p) {
WriteParam(m, p.GetAsString());
}
-bool ParamTraits<URLPattern>::Read(const Message* m, PickleIterator* iter,
+bool ParamTraits<URLPattern>::Read(const Message* m,
+ base::PickleIterator* iter,
param_type* p) {
int valid_schemes;
std::string spec;
@@ -141,8 +144,9 @@ void ParamTraits<URLPatternSet>::Write(Message* m, const param_type& p) {
WriteParam(m, p.patterns());
}
-bool ParamTraits<URLPatternSet>::Read(const Message* m, PickleIterator* iter,
- param_type* p) {
+bool ParamTraits<URLPatternSet>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* p) {
std::set<URLPattern> patterns;
if (!ReadParam(m, iter, &patterns))
return false;
@@ -162,8 +166,9 @@ void ParamTraits<APIPermission::ID>::Write(
WriteParam(m, static_cast<int>(p));
}
-bool ParamTraits<APIPermission::ID>::Read(
- const Message* m, PickleIterator* iter, param_type* p) {
+bool ParamTraits<APIPermission::ID>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* p) {
int api_id = -2;
if (!ReadParam(m, iter, &api_id))
return false;
@@ -188,8 +193,9 @@ void ParamTraits<APIPermissionSet>::Write(
}
}
-bool ParamTraits<APIPermissionSet>::Read(
- const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<APIPermissionSet>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
size_t size;
if (!ReadParam(m, iter, &size))
return false;
@@ -225,8 +231,9 @@ void ParamTraits<ManifestPermissionSet>::Write(
}
}
-bool ParamTraits<ManifestPermissionSet>::Read(
- const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<ManifestPermissionSet>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
size_t size;
if (!ReadParam(m, iter, &size))
return false;
@@ -255,8 +262,9 @@ void ParamTraits<HostID>::Write(
WriteParam(m, p.id());
}
-bool ParamTraits<HostID>::Read(
- const Message* m, PickleIterator* iter, param_type* r) {
+bool ParamTraits<HostID>::Read(const Message* m,
+ base::PickleIterator* iter,
+ param_type* r) {
HostID::HostType type;
std::string id;
if (!ReadParam(m, iter, &type))
@@ -281,9 +289,10 @@ void ParamTraits<ExtensionMsg_PermissionSetStruct>::Write(Message* m,
WriteParam(m, p.scriptable_hosts);
}
-bool ParamTraits<ExtensionMsg_PermissionSetStruct>::Read(const Message* m,
- PickleIterator* iter,
- param_type* p) {
+bool ParamTraits<ExtensionMsg_PermissionSetStruct>::Read(
+ const Message* m,
+ base::PickleIterator* iter,
+ param_type* p) {
return ReadParam(m, iter, &p->apis) &&
ReadParam(m, iter, &p->manifest_permissions) &&
ReadParam(m, iter, &p->explicit_hosts) &&
@@ -309,7 +318,7 @@ void ParamTraits<ExtensionMsg_Loaded_Params>::Write(Message* m,
}
bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const Message* m,
- PickleIterator* iter,
+ base::PickleIterator* iter,
param_type* p) {
p->manifest.reset(new base::DictionaryValue());
return ReadParam(m, iter, &p->location) && ReadParam(m, iter, &p->path) &&
diff --git a/extensions/common/permissions/api_permission.cc b/extensions/common/permissions/api_permission.cc
index 77afe9d..7d8f04e 100644
--- a/extensions/common/permissions/api_permission.cc
+++ b/extensions/common/permissions/api_permission.cc
@@ -84,7 +84,7 @@ class SimpleAPIPermission : public APIPermission {
void Write(IPC::Message* m) const override {}
- bool Read(const IPC::Message* m, PickleIterator* iter) override {
+ bool Read(const IPC::Message* m, base::PickleIterator* iter) override {
return true;
}
diff --git a/extensions/common/permissions/api_permission_set_unittest.cc b/extensions/common/permissions/api_permission_set_unittest.cc
index 0574250..78a0161 100644
--- a/extensions/common/permissions/api_permission_set_unittest.cc
+++ b/extensions/common/permissions/api_permission_set_unittest.cc
@@ -280,7 +280,7 @@ TEST(APIPermissionSetTest, IPC) {
IPC::Message m;
WriteParam(&m, apis);
- PickleIterator iter(m);
+ base::PickleIterator iter(m);
CHECK(ReadParam(&m, &iter, &expected_apis));
EXPECT_EQ(apis, expected_apis);
}
diff --git a/extensions/common/permissions/manifest_permission.cc b/extensions/common/permissions/manifest_permission.cc
index 6be6b18..a3ba98e 100644
--- a/extensions/common/permissions/manifest_permission.cc
+++ b/extensions/common/permissions/manifest_permission.cc
@@ -34,7 +34,8 @@ void ManifestPermission::Write(IPC::Message* m) const {
IPC::WriteParam(m, singleton);
}
-bool ManifestPermission::Read(const IPC::Message* m, PickleIterator* iter) {
+bool ManifestPermission::Read(const IPC::Message* m,
+ base::PickleIterator* iter) {
base::ListValue singleton;
if (!IPC::ReadParam(m, iter, &singleton))
return false;
diff --git a/extensions/common/permissions/settings_override_permission.cc b/extensions/common/permissions/settings_override_permission.cc
index 4514a3f..c45678c 100644
--- a/extensions/common/permissions/settings_override_permission.cc
+++ b/extensions/common/permissions/settings_override_permission.cc
@@ -109,7 +109,7 @@ APIPermission* SettingsOverrideAPIPermission::Intersect(
void SettingsOverrideAPIPermission::Write(IPC::Message* m) const {}
bool SettingsOverrideAPIPermission::Read(const IPC::Message* m,
- PickleIterator* iter) {
+ base::PickleIterator* iter) {
return true;
}
diff --git a/extensions/common/permissions/socket_permission_unittest.cc b/extensions/common/permissions/socket_permission_unittest.cc
index 0b1fae0..1ed207e 100644
--- a/extensions/common/permissions/socket_permission_unittest.cc
+++ b/extensions/common/permissions/socket_permission_unittest.cc
@@ -275,7 +275,7 @@ TEST(SocketPermissionTest, IPC) {
permission_info->CreateAPIPermission());
permission1->Write(&m);
- PickleIterator iter(m);
+ base::PickleIterator iter(m);
permission2->Read(&m, &iter);
EXPECT_TRUE(permission1->Equal(permission2.get()));
@@ -298,7 +298,7 @@ TEST(SocketPermissionTest, IPC) {
EXPECT_FALSE(permission1->Equal(permission2.get()));
permission1->Write(&m);
- PickleIterator iter(m);
+ base::PickleIterator iter(m);
permission2->Read(&m, &iter);
EXPECT_TRUE(permission1->Equal(permission2.get()));
}
diff --git a/extensions/common/user_script.h b/extensions/common/user_script.h
index 070679e..93ca14f 100644
--- a/extensions/common/user_script.h
+++ b/extensions/common/user_script.h
@@ -235,7 +235,8 @@ class UserScript {
void Unpickle(const base::Pickle& pickle, base::PickleIterator* iter);
private:
- // Pickle helper functions used to pickle the individual types of components.
+ // base::Pickle helper functions used to pickle the individual types of
+ // components.
void PickleGlobs(base::Pickle* pickle,
const std::vector<std::string>& globs) const;
void PickleHostID(base::Pickle* pickle, const HostID& host_id) const;
diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc
index 4a964f7..1dae0a2 100644
--- a/extensions/common/user_script_unittest.cc
+++ b/extensions/common/user_script_unittest.cc
@@ -196,10 +196,10 @@ TEST(ExtensionUserScriptTest, Pickle) {
HostID id(HostID::EXTENSIONS, kExtensionId);
script1.set_host_id(id);
- Pickle pickle;
+ base::Pickle pickle;
script1.Pickle(&pickle);
- PickleIterator iter(pickle);
+ base::PickleIterator iter(pickle);
UserScript script2;
script2.Unpickle(pickle, &iter);
diff --git a/extensions/renderer/user_script_set.cc b/extensions/renderer/user_script_set.cc
index 01e8a5a..6af8627 100644
--- a/extensions/renderer/user_script_set.cc
+++ b/extensions/renderer/user_script_set.cc
@@ -98,21 +98,22 @@ bool UserScriptSet::UpdateUserScripts(base::SharedMemoryHandle shared_memory,
return false;
// First get the size of the memory block.
- if (!shared_memory_->Map(sizeof(Pickle::Header)))
+ if (!shared_memory_->Map(sizeof(base::Pickle::Header)))
return false;
- Pickle::Header* pickle_header =
- reinterpret_cast<Pickle::Header*>(shared_memory_->memory());
+ base::Pickle::Header* pickle_header =
+ reinterpret_cast<base::Pickle::Header*>(shared_memory_->memory());
// Now map in the rest of the block.
- int pickle_size = sizeof(Pickle::Header) + pickle_header->payload_size;
+ int pickle_size = sizeof(base::Pickle::Header) + pickle_header->payload_size;
shared_memory_->Unmap();
if (!shared_memory_->Map(pickle_size))
return false;
// Unpickle scripts.
size_t num_scripts = 0;
- Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()), pickle_size);
- PickleIterator iter(pickle);
+ base::Pickle pickle(reinterpret_cast<char*>(shared_memory_->memory()),
+ pickle_size);
+ base::PickleIterator iter(pickle);
CHECK(iter.ReadSizeT(&num_scripts));
scripts_.clear();
generated by cgit v1.1 at 2024-09-22 07:41:33 +0000