Index: ppapi/proxy/ppapi_param_traits.h |
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h |
index d2d47629720ad913d0b81a773a9639d0c1978757..6aff57450f838e6d44fb2344b3373fb05ba9f850 100644 |
--- a/ppapi/proxy/ppapi_param_traits.h |
+++ b/ppapi/proxy/ppapi_param_traits.h |
@@ -49,7 +49,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<PP_Bool> { |
typedef PP_Bool param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -57,7 +57,7 @@ template <> |
struct PPAPI_PROXY_EXPORT ParamTraits<PP_NetAddress_Private> { |
typedef PP_NetAddress_Private param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* p); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -65,7 +65,7 @@ template <> |
struct PPAPI_PROXY_EXPORT ParamTraits<PP_KeyInformation> { |
typedef PP_KeyInformation param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* p); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -74,7 +74,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits< |
ppapi::proxy::PPBFlash_DrawGlyphs_Params> { |
typedef ppapi::proxy::PPBFlash_DrawGlyphs_Params param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -83,7 +83,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits< |
ppapi::proxy::PPBURLLoader_UpdateProgress_Params> { |
typedef ppapi::proxy::PPBURLLoader_UpdateProgress_Params param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -91,7 +91,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedDirEntry> { |
typedef ppapi::proxy::SerializedDirEntry param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -99,7 +99,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFontDescription> { |
typedef ppapi::proxy::SerializedFontDescription param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -108,7 +108,7 @@ struct PPAPI_PROXY_EXPORT |
ParamTraits<ppapi::proxy::SerializedTrueTypeFontDesc> { |
typedef ppapi::proxy::SerializedTrueTypeFontDesc param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -116,7 +116,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedHandle> { |
typedef ppapi::proxy::SerializedHandle param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -124,7 +124,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::HostResource> { |
typedef ppapi::HostResource param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -132,7 +132,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedVar> { |
typedef ppapi::proxy::SerializedVar param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -141,7 +141,7 @@ struct PPAPI_PROXY_EXPORT ParamTraits< |
std::vector<ppapi::proxy::SerializedVar> > { |
typedef std::vector<ppapi::proxy::SerializedVar> param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -149,7 +149,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PpapiPermissions> { |
typedef ppapi::PpapiPermissions param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -158,7 +158,7 @@ template <> |
struct ParamTraits<ppapi::PepperFilePath> { |
typedef ppapi::PepperFilePath param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* p); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* p); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -166,7 +166,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> { |
typedef ppapi::proxy::SerializedFlashMenu param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
#endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
@@ -175,7 +175,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> { |
typedef ppapi::PPB_X509Certificate_Fields param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -183,7 +183,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::SocketOptionData> { |
typedef ppapi::SocketOptionData param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |
@@ -191,7 +191,7 @@ template<> |
struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::CompositorLayerData::Transform> { |
typedef ppapi::CompositorLayerData::Transform param_type; |
static void Write(Message* m, const param_type& p); |
- static bool Read(const Message* m, PickleIterator* iter, param_type* r); |
+ static bool Read(const Message* m, base::PickleIterator* iter, param_type* r); |
static void Log(const param_type& p, std::string* l); |
}; |