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

Unified Diff: content/common/android/gin_java_bridge_value.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, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/threaded_data_provider.cc ('k') | content/common/cc_messages.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/android/gin_java_bridge_value.cc
diff --git a/content/common/android/gin_java_bridge_value.cc b/content/common/android/gin_java_bridge_value.cc
index 465383c993eb27511fb59c6abfff2f52936ecf3c..b9de5f9c14d5e7ac0a91adaf366c5b2c157cd75e 100644
--- a/content/common/android/gin_java_bridge_value.cc
+++ b/content/common/android/gin_java_bridge_value.cc
@@ -17,7 +17,7 @@ namespace {
const uint32 kHeaderMagic = 0xBEEFCAFE;
#pragma pack(push, 4)
-struct Header : public Pickle::Header {
+struct Header : public base::Pickle::Header {
uint32 magic;
int32 type;
};
@@ -61,7 +61,7 @@ bool GinJavaBridgeValue::ContainsGinJavaBridgeValue(const base::Value* value) {
reinterpret_cast<const base::BinaryValue*>(value);
if (binary_value->GetSize() < sizeof(Header))
return false;
- Pickle pickle(binary_value->GetBuffer(), binary_value->GetSize());
+ base::Pickle pickle(binary_value->GetBuffer(), binary_value->GetSize());
// Broken binary value: payload or header size is wrong
if (!pickle.data() || pickle.size() - pickle.payload_size() != sizeof(Header))
return false;
@@ -92,7 +92,7 @@ bool GinJavaBridgeValue::IsType(Type type) const {
bool GinJavaBridgeValue::GetAsNonFinite(float* out_value) const {
if (GetType() == TYPE_NONFINITE) {
- PickleIterator iter(pickle_);
+ base::PickleIterator iter(pickle_);
return iter.ReadFloat(out_value);
} else {
return false;
@@ -101,7 +101,7 @@ bool GinJavaBridgeValue::GetAsNonFinite(float* out_value) const {
bool GinJavaBridgeValue::GetAsObjectID(int32* out_object_id) const {
if (GetType() == TYPE_OBJECT_ID) {
- PickleIterator iter(pickle_);
+ base::PickleIterator iter(pickle_);
return iter.ReadInt(out_object_id);
} else {
return false;
« no previous file with comments | « content/child/threaded_data_provider.cc ('k') | content/common/cc_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698