Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 24 insertions, 1 deletions

diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc
index f437bf4..2a42c6c 100644
--- a/chrome/common/render_messages.cc
+++ b/chrome/common/render_messages.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/resource_response.h"
 #include "chrome/common/serialized_script_value.h"
+#include "chrome/common/speech_input_result.h"
 #include "chrome/common/thumbnail_score.h"
 #include "gfx/rect.h"
 #include "ipc/ipc_channel_handle.h"
@@ -863,7 +864,7 @@ bool ParamTraits<URLPattern>::Read(const Message* m, void** iter,
     return false;
 
   p->set_valid_schemes(valid_schemes);
-  return p->Parse(spec);
+  return URLPattern::PARSE_SUCCESS == p->Parse(spec);
 }
 
 void ParamTraits<URLPattern>::Log(const param_type& p, std::string* l) {
@@ -1229,4 +1230,26 @@ void ParamTraits<PepperDirEntry>::Log(const param_type& p, std::string* l) {
   l->append(")");
 }
 
+void ParamTraits<speech_input::SpeechInputResultItem>::Write(
+    Message* m, const param_type& p) {
+  WriteParam(m, p.utterance);
+  WriteParam(m, p.confidence);
+}
+
+bool ParamTraits<speech_input::SpeechInputResultItem>::Read(const Message* m,
+                                                            void** iter,
+                                                            param_type* p) {
+  return ReadParam(m, iter, &p->utterance) &&
+         ReadParam(m, iter, &p->confidence);
+}
+
+void ParamTraits<speech_input::SpeechInputResultItem>::Log(const param_type& p,
+                                                           std::string* l) {
+  l->append("(");
+  LogParam(p.utterance, l);
+  l->append(":");
+  LogParam(p.confidence, l);
+  l->append(")");
+}
+
 }  // namespace IPC