Refactor ZLib and Verbatim encoders.

remoting/protocol/jingle_session_manager.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/jingle_session_manager.h"
 
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/jingle_glue/jingle_thread.h"
@@ skipping 347 matching lines @@
     const XmlElement* child = NULL;
 
     // <control> tags.
     QName control_tag(kChromotingXmlNamespace, kControlTag);
     child = element->FirstNamed(control_tag);
     while (child) {
       ChannelConfig channel_config;
       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.
     QName event_tag(kChromotingXmlNamespace, kEventTag);
     child = element->FirstNamed(event_tag);
     while (child) {
       ChannelConfig channel_config;
       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.
     QName video_tag(kChromotingXmlNamespace, kVideoTag);
     child = element->FirstNamed(video_tag);
     while (child) {
       ChannelConfig channel_config;
       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.
     child = element->FirstNamed(QName(kChromotingXmlNamespace, kResolutionTag));
     if (!child)
       return false; // Resolution must always be specified.
     int width;
     int height;
     if (!base::StringToInt(child->Attr(QName(kDefaultNs, kWidthAttr)),
                            &width) ||
@@ skipping 75 matching lines @@
     const std::string& auth_token) {
   cricket::SessionDescription* desc = new cricket::SessionDescription();
   desc->AddContent(JingleSession::kChromotingContentName,
                    kChromotingXmlNamespace,
                    new ContentDescription(config, auth_token));
   return desc;
 }
 
 }  // namespace protocol
 }  // namespace remoting