Merge SettingsMap changes from server code

net/spdy/spdy_framer.cc

 // Copyright (c) 2012 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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 971 matching lines @@
     if (!parser.ReadBytes(&id_and_flags_wire, 4)) {
       return false;
     }
     if (!parser.ReadUInt32(&value))
       return false;
     SettingsFlagsAndId flags_and_id =
         SettingsFlagsAndId::FromWireFormat(frame->version(), id_and_flags_wire);
     SpdySettingsIds id = static_cast<SpdySettingsIds>(flags_and_id.id());
     SpdySettingsFlags flags =
         static_cast<SpdySettingsFlags>(flags_and_id.flags());
-    settings->insert(std::make_pair(id, SettingsFlagsAndValue(flags, value)));
+    (*settings)[id] = SettingsFlagsAndValue(flags, value);
   }
   return true;
 }
 
 /* static */
 bool SpdyFramer::ParseCredentialData(const char* data, size_t len,
                                      SpdyCredential* credential) {
   DCHECK(credential);
 
   SpdyFrameReader parser(data, len);
@@ skipping 103 matching lines @@
   DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyRstStreamControlFrame*>(frame.take());
 }
 
 SpdySettingsControlFrame* SpdyFramer::CreateSettings(
     const SettingsMap& values) const {
   size_t frame_size = SpdySettingsControlFrame::size() + 8 * values.size();
   SpdyFrameBuilder frame(SETTINGS, CONTROL_FLAG_NONE, spdy_version_,
                          frame_size);
   frame.WriteUInt32(values.size());
-  SettingsMap::const_iterator it = values.begin();
-  while (it != values.end()) {
+  for (SettingsMap::const_iterator it = values.begin();
+       it != values.end();
+       it++) {
     SettingsFlagsAndId flags_and_id(it->second.first, it->first);
     uint32 id_and_flags_wire = flags_and_id.GetWireFormat(spdy_version_);
     frame.WriteBytes(&id_and_flags_wire, 4);
     frame.WriteUInt32(it->second.second);
-    ++it;
   }
   DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdySettingsControlFrame*>(frame.take());
 }
 
 SpdyPingControlFrame* SpdyFramer::CreatePingFrame(uint32 unique_id) const {
   size_t frame_size = SpdyPingControlFrame::size();
   SpdyFrameBuilder frame(PING, CONTROL_FLAG_NONE, spdy_version_, frame_size);
   frame.WriteUInt32(unique_id);
   DCHECK_EQ(frame.length(), frame_size);
@@ skipping 487 matching lines @@
     }
   }
   return stream_id;
 }
 
 void SpdyFramer::set_enable_compression(bool value) {
   enable_compression_ = value;
 }
 
 }  // namespace net