Consistently log the ID of a spdy stream as "stream_id"

Review URL: https://chromiumcodereview.appspot.com/10389026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136080 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 5 insertions, 5 deletions

diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index aa889bc..a2249cb 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -41,11 +41,11 @@ namespace net {
 NetLogSpdySynParameter::NetLogSpdySynParameter(
     const linked_ptr<SpdyHeaderBlock>& headers,
     SpdyControlFlags flags,
-    SpdyStreamId id,
+    SpdyStreamId stream_id,
     SpdyStreamId associated_stream)
     : headers_(headers),
       flags_(flags),
-      id_(id),
+      stream_id_(stream_id),
       associated_stream_(associated_stream) {
 }
 
@@ -59,7 +59,7 @@ Value* NetLogSpdySynParameter::ToValue() const {
   }
   dict->SetInteger("flags", flags_);
   dict->Set("headers", headers_list);
-  dict->SetInteger("id", id_);
+  dict->SetInteger("stream_id", stream_id_);
   if (associated_stream_)
     dict->SetInteger("associated_stream", associated_stream_);
   return dict;
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index 787cb0e..a3cb485 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -709,7 +709,7 @@ class NetLogSpdySynParameter : public NetLog::EventParameters {
  private:
   const linked_ptr<SpdyHeaderBlock> headers_;
   const SpdyControlFlags flags_;
-  const SpdyStreamId id_;
+  const SpdyStreamId stream_id_;
   const SpdyStreamId associated_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(NetLogSpdySynParameter);
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc
index f1ef5b7..c3b0686 100644
--- a/net/spdy/spdy_stream.cc
+++ b/net/spdy/spdy_stream.cc
@@ -45,7 +45,7 @@ class NetLogSpdyStreamWindowUpdateParameter : public NetLog::EventParameters {
 
   virtual Value* ToValue() const {
     DictionaryValue* dict = new DictionaryValue();
-    dict->SetInteger("id", static_cast<int>(stream_id_));
+    dict->SetInteger("stream_id", stream_id_);
     dict->SetInteger("delta", delta_);
     dict->SetInteger("window_size", window_size_);
     return dict;