Refactor ZLib and Verbatim encoders.

remoting/protocol/jingle_session_manager.cc

Index: remoting/protocol/jingle_session_manager.cc
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc
index 46367c9e0a03ace5209d0dc8f0e76df647e2ff3d..12f92982a21c23c4fa6604c54822daf9dc929f95 100644
--- a/remoting/protocol/jingle_session_manager.cc
+++ b/remoting/protocol/jingle_session_manager.cc
@@ -365,7 +365,7 @@ bool JingleSessionManager::ParseContent(
       if (!ParseChannelConfig(child, false, &channel_config))
         return false;
       config->mutable_control_configs()->push_back(channel_config);
-      child = element->NextNamed(control_tag);
+      child = child->NextNamed(control_tag);
     }
 
     // <event> tags.
@@ -376,7 +376,7 @@ bool JingleSessionManager::ParseContent(
       if (!ParseChannelConfig(child, false, &channel_config))
         return false;
       config->mutable_event_configs()->push_back(channel_config);
-      child = element->NextNamed(event_tag);
+      child = child->NextNamed(event_tag);
     }
 
     // <video> tags.
@@ -387,7 +387,7 @@ bool JingleSessionManager::ParseContent(
       if (!ParseChannelConfig(child, true, &channel_config))
         return false;
       config->mutable_video_configs()->push_back(channel_config);
-      child = element->NextNamed(video_tag);
+      child = child->NextNamed(video_tag);
     }
 
     // <initial-resolution> tag.