Remove SpdyDataFlags from SpdyFramerVisitorInterface::OnStreamFrameData()

This lands server change 43182358.

TBR=rch@chromium.org

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

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

12 files changed, 30 insertions, 31 deletions

diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc
index 5f06fea..fb1dcd7 100644
--- a/net/spdy/buffered_spdy_framer.cc
+++ b/net/spdy/buffered_spdy_framer.cc
@@ -154,8 +154,8 @@ void BufferedSpdyFramer::OnDataFrameHeader(SpdyStreamId stream_id,
 void BufferedSpdyFramer::OnStreamFrameData(SpdyStreamId stream_id,
                                            const char* data,
                                            size_t len,
-                                           SpdyDataFlags flags) {
-  visitor_->OnStreamFrameData(stream_id, data, len, flags);
+                                           bool fin) {
+  visitor_->OnStreamFrameData(stream_id, data, len, fin);
 }
 
 void BufferedSpdyFramer::OnSetting(SpdySettingsIds id,
diff --git a/net/spdy/buffered_spdy_framer.h b/net/spdy/buffered_spdy_framer.h
index ff0b082..7615e83 100644
--- a/net/spdy/buffered_spdy_framer.h
+++ b/net/spdy/buffered_spdy_framer.h
@@ -57,7 +57,7 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramerVisitorInterface {
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) = 0;
+                                 bool fin) = 0;
 
   // Called when an individual setting within a SETTINGS frame has been parsed
   // and validated.
@@ -122,7 +122,7 @@ class NET_EXPORT_PRIVATE BufferedSpdyFramer
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE;
+                                 bool fin) OVERRIDE;
   virtual void OnSetting(
       SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE;
   virtual void OnPing(uint32 unique_id) OVERRIDE;
diff --git a/net/spdy/buffered_spdy_framer_spdy2_unittest.cc b/net/spdy/buffered_spdy_framer_spdy2_unittest.cc
index 56e5296..74a215c 100644
--- a/net/spdy/buffered_spdy_framer_spdy2_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_spdy2_unittest.cc
@@ -72,7 +72,7 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface {
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE {
+                                 bool fin) OVERRIDE {
     LOG(FATAL) << "Unexpected OnStreamFrameData call.";
   }
 
diff --git a/net/spdy/buffered_spdy_framer_spdy3_unittest.cc b/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
index 8eb25a0..c56365b 100644
--- a/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
@@ -71,7 +71,7 @@ class TestBufferedSpdyVisitor : public BufferedSpdyFramerVisitorInterface {
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE {
+                                 bool fin) OVERRIDE {
     LOG(FATAL) << "Unexpected OnStreamFrameData call.";
   }
 
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index 1d83d32..b8b57c1 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -599,8 +599,8 @@ size_t SpdyFramer::ProcessCommonHeader(const char* data, size_t len) {
       } else {
         // Empty data frame.
         if (current_frame_flags_ & DATA_FLAG_FIN) {
-          visitor_->OnStreamFrameData(current_frame_stream_id_,
-                                      NULL, 0, DATA_FLAG_FIN);
+          visitor_->OnStreamFrameData(
+              current_frame_stream_id_, NULL, 0, true);
         }
         CHANGE_STATE(SPDY_AUTO_RESET);
       }
@@ -1131,8 +1131,7 @@ size_t SpdyFramer::ProcessControlFrameHeaderBlock(const char* data,
 
     // If this is a FIN, tell the caller.
     if (current_frame_flags_ & CONTROL_FLAG_FIN) {
-      visitor_->OnStreamFrameData(
-          current_frame_stream_id_, NULL, 0, DATA_FLAG_FIN);
+      visitor_->OnStreamFrameData(current_frame_stream_id_, NULL, 0, true);
     }
 
     CHANGE_STATE(SPDY_AUTO_RESET);
@@ -1355,7 +1354,7 @@ size_t SpdyFramer::ProcessDataFramePayload(const char* data, size_t len) {
       // Only inform the visitor if there is data.
       if (amount_to_forward) {
         visitor_->OnStreamFrameData(
-            current_frame_stream_id_, data, amount_to_forward, SpdyDataFlags());
+            current_frame_stream_id_, data, amount_to_forward, false);
       }
     }
     data += amount_to_forward;
@@ -1365,8 +1364,7 @@ size_t SpdyFramer::ProcessDataFramePayload(const char* data, size_t len) {
     // If the FIN flag is set, and there is no more data in this data
     // frame, inform the visitor of EOF via a 0-length data frame.
     if (!remaining_data_length_ && current_frame_flags_ & DATA_FLAG_FIN) {
-      visitor_->OnStreamFrameData(
-          current_frame_stream_id_, NULL, 0, DATA_FLAG_FIN);
+      visitor_->OnStreamFrameData(current_frame_stream_id_, NULL, 0, true);
     }
   }
 
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index c691d73..9cf6b78 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -194,7 +194,7 @@ class NET_EXPORT_PRIVATE SpdyFramerVisitorInterface {
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) = 0;
+                                 bool fin) = 0;
 
   // Called when a complete setting within a SETTINGS frame has been parsed and
   // validated.
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 9a9f956..f3af86f 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -52,7 +52,7 @@ class MockVisitor : public SpdyFramerVisitorInterface {
   MOCK_METHOD4(OnStreamFrameData, void(SpdyStreamId stream_id,
                                        const char* data,
                                        size_t len,
-                                       SpdyDataFlags flags));
+                                       bool fin));
   MOCK_METHOD3(OnSetting, void(SpdySettingsIds id, uint8 flags, uint32 value));
   MOCK_METHOD1(OnPing, void(uint32 unique_id));
   MOCK_METHOD2(OnRstStream, void(SpdyStreamId stream_id,
@@ -206,7 +206,7 @@ class SpdyFramerTestUtil {
     virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                    const char* data,
                                    size_t len,
-                                   SpdyDataFlags flags) OVERRIDE {
+                                   bool fin) OVERRIDE {
       LOG(FATAL);
     }
     virtual void OnSetting(SpdySettingsIds id,
@@ -310,7 +310,7 @@ class TestSpdyVisitor : public SpdyFramerVisitorInterface,
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE {
+                                 bool fin) OVERRIDE {
     EXPECT_EQ(header_stream_id_, stream_id);
     if (len == 0)
       ++zero_length_data_frame_count_;
@@ -3687,9 +3687,9 @@ TEST_P(SpdyFramerTest, DataFrameFlags) {
       EXPECT_CALL(visitor, OnError(_));
     } else {
       EXPECT_CALL(visitor, OnDataFrameHeader(1, 5, flags & DATA_FLAG_FIN));
-      EXPECT_CALL(visitor, OnStreamFrameData(_, _, 5, SpdyDataFlags()));
+      EXPECT_CALL(visitor, OnStreamFrameData(_, _, 5, false));
       if (flags & DATA_FLAG_FIN) {
-        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, DATA_FLAG_FIN));
+        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, true));
       }
     }
 
@@ -3729,7 +3729,7 @@ TEST_P(SpdyFramerTest, SynStreamFrameFlags) {
       EXPECT_CALL(visitor, OnControlFrameHeaderData(8, _, _))
           .WillRepeatedly(testing::Return(true));
       if (flags & DATA_FLAG_FIN) {
-        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, DATA_FLAG_FIN));
+        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, true));
       }
     }
 
@@ -3766,7 +3766,7 @@ TEST_P(SpdyFramerTest, SynReplyFrameFlags) {
       EXPECT_CALL(visitor, OnControlFrameHeaderData(37, _, _))
           .WillRepeatedly(testing::Return(true));
       if (flags & DATA_FLAG_FIN) {
-        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, DATA_FLAG_FIN));
+        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, true));
       }
     }
 
@@ -3894,7 +3894,7 @@ TEST_P(SpdyFramerTest, HeadersFrameFlags) {
       EXPECT_CALL(visitor, OnControlFrameHeaderData(57, _, _))
           .WillRepeatedly(testing::Return(true));
       if (flags & DATA_FLAG_FIN) {
-        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, DATA_FLAG_FIN));
+        EXPECT_CALL(visitor, OnStreamFrameData(_, _, 0, true));
       }
     }
 
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 6c154e7..61fd280 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -151,12 +151,12 @@ base::Value* NetLogSpdySessionWindowUpdateCallback(
 
 base::Value* NetLogSpdyDataCallback(SpdyStreamId stream_id,
                                     int size,
-                                    SpdyDataFlags flags,
+                                    bool fin,
                                     NetLog::LogLevel /* log_level */) {
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetInteger("stream_id", static_cast<int>(stream_id));
   dict->SetInteger("size", size);
-  dict->SetInteger("flags", static_cast<int>(flags));
+  dict->SetBoolean("fin", fin);
   return dict;
 }
 
@@ -791,7 +791,8 @@ SpdyFrame* SpdySession::CreateDataFrame(SpdyStreamId stream_id,
   if (net_log().IsLoggingAllEvents()) {
     net_log().AddEvent(
         NetLog::TYPE_SPDY_SESSION_SEND_DATA,
-        base::Bind(&NetLogSpdyDataCallback, stream_id, len, flags));
+        base::Bind(&NetLogSpdyDataCallback, stream_id, len,
+                   (flags & DATA_FLAG_FIN) != 0));
   }
 
   // Send PrefacePing for DATA_FRAMEs with nonzero payload size.
@@ -1379,12 +1380,12 @@ void SpdySession::OnStreamError(SpdyStreamId stream_id,
 void SpdySession::OnStreamFrameData(SpdyStreamId stream_id,
                                     const char* data,
                                     size_t len,
-                                    SpdyDataFlags flags) {
+                                    bool fin) {
   DCHECK_LT(len, 1u << 24);
   if (net_log().IsLoggingAllEvents()) {
     net_log().AddEvent(
         NetLog::TYPE_SPDY_SESSION_RECV_DATA,
-        base::Bind(&NetLogSpdyDataCallback, stream_id, len, flags));
+        base::Bind(&NetLogSpdyDataCallback, stream_id, len, fin));
   }
 
   if (flow_control_state_ == FLOW_CONTROL_STREAM_AND_SESSION && len > 0)
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index b025bdf..4facb51 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -618,7 +618,7 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>,
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE;
+                                 bool fin) OVERRIDE;
   virtual void OnSetting(
       SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE;
   virtual void OnWindowUpdate(SpdyStreamId stream_id,
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index 0f38c1d..b2cb945 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -45,7 +45,7 @@ class PriorityGetter : public BufferedSpdyFramerVisitorInterface {
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE {}
+                                 bool fin) OVERRIDE {}
   virtual void OnSetting(
       SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE {}
   virtual void OnPing(uint32 unique_id) OVERRIDE {}
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc
index 7d0edd0..1c34e79 100644
--- a/net/tools/flip_server/spdy_interface.cc
+++ b/net/tools/flip_server/spdy_interface.cc
@@ -185,7 +185,7 @@ int SpdySM::SpdyHandleNewStream(
 void SpdySM::OnStreamFrameData(SpdyStreamId stream_id,
                                const char* data,
                                size_t len,
-                               SpdyDataFlags flags) {
+                               bool fin) {
   VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: StreamData(" << stream_id
           << ", [" << len << "])";
   StreamToSmif::iterator it = stream_to_smif_.find(stream_id);
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index cde64f5..5284ed2 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -88,7 +88,7 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface,
   virtual void OnStreamFrameData(SpdyStreamId stream_id,
                                  const char* data,
                                  size_t len,
-                                 SpdyDataFlags flags) OVERRIDE;
+                                 bool fin) OVERRIDE;
 
   // Called when an individual setting within a SETTINGS frame has been parsed
   // and validated.