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

Unified Diff: android_webview/native/aw_contents.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 | « no previous file | android_webview/native/state_serializer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index c7af67fb7f51d095989becbfe15a2c361f37295c..30c243e11e55ab2d132f20ce482a331d490990ef 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -846,7 +846,7 @@ AwContents::GetOpaqueState(JNIEnv* env, jobject obj) {
if (!web_contents_->GetController().GetEntryCount())
return ScopedJavaLocalRef<jbyteArray>();
- Pickle pickle;
+ base::Pickle pickle;
if (!WriteToPickle(*web_contents_, &pickle)) {
return ScopedJavaLocalRef<jbyteArray>();
} else {
@@ -863,9 +863,9 @@ jboolean AwContents::RestoreFromOpaqueState(
std::vector<uint8> state_vector;
base::android::JavaByteArrayToByteVector(env, state, &state_vector);
- Pickle pickle(reinterpret_cast<const char*>(state_vector.data()),
- state_vector.size());
- PickleIterator iterator(pickle);
+ base::Pickle pickle(reinterpret_cast<const char*>(state_vector.data()),
+ state_vector.size());
+ base::PickleIterator iterator(pickle);
return RestoreFromPickle(&iterator, web_contents_.get());
}
« no previous file with comments | « no previous file | android_webview/native/state_serializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698