| Index: android_webview/native/state_serializer.h
|
| diff --git a/android_webview/native/state_serializer.h b/android_webview/native/state_serializer.h
|
| index 3dc6181b582f78d3ed7d79e692496c10a22f7e8a..b220ccfb5f0119c7aa184f9db589f7cdbc0b8fa9 100644
|
| --- a/android_webview/native/state_serializer.h
|
| +++ b/android_webview/native/state_serializer.h
|
| @@ -7,9 +7,13 @@
|
|
|
| #include "base/compiler_specific.h"
|
|
|
| +namespace base {
|
| +
|
| class Pickle;
|
| class PickleIterator;
|
|
|
| +} // namespace base
|
| +
|
| namespace content {
|
|
|
| class NavigationEntry;
|
| @@ -24,23 +28,24 @@ namespace android_webview {
|
|
|
| // Note that |pickle| may be changed even if function returns false.
|
| bool WriteToPickle(const content::WebContents& web_contents,
|
| - Pickle* pickle) WARN_UNUSED_RESULT;
|
| + base::Pickle* pickle) WARN_UNUSED_RESULT;
|
|
|
| // |web_contents| will not be modified if function returns false.
|
| -bool RestoreFromPickle(PickleIterator* iterator,
|
| +bool RestoreFromPickle(base::PickleIterator* iterator,
|
| content::WebContents* web_contents) WARN_UNUSED_RESULT;
|
|
|
|
|
| namespace internal {
|
| +
|
| // Functions below are individual helper functiosn called by functions above.
|
| // They are broken up for unit testing, and should not be called out side of
|
| // tests.
|
| -bool WriteHeaderToPickle(Pickle* pickle) WARN_UNUSED_RESULT;
|
| -bool RestoreHeaderFromPickle(PickleIterator* iterator) WARN_UNUSED_RESULT;
|
| +bool WriteHeaderToPickle(base::Pickle* pickle) WARN_UNUSED_RESULT;
|
| +bool RestoreHeaderFromPickle(base::PickleIterator* iterator) WARN_UNUSED_RESULT;
|
| bool WriteNavigationEntryToPickle(const content::NavigationEntry& entry,
|
| - Pickle* pickle) WARN_UNUSED_RESULT;
|
| + base::Pickle* pickle) WARN_UNUSED_RESULT;
|
| bool RestoreNavigationEntryFromPickle(
|
| - PickleIterator* iterator,
|
| + base::PickleIterator* iterator,
|
| content::NavigationEntry* entry) WARN_UNUSED_RESULT;
|
|
|
| } // namespace interanl
|
|
|